Commit e913cc7f authored by wujipeng's avatar wujipeng
Browse files

bug修复

parent 74d345cb
......@@ -198,6 +198,10 @@ BEGIN
class_name = COALESCE(NULLIF(class_name, ''), '未设置'),
teaching_purpose = COALESCE(NULLIF(teaching_purpose, ''), '待补充');
-- 旧版表把教学重点和教学难点定义为 NOT NULL,但新版教案编辑器允许两项留空,
-- 服务层也会把空白文本规范化为 NULL。这里必须显式放宽历史列约束;仅修改上方
-- CREATE TABLE 对已经存在的表无效,会导致保存草稿和首次提交在 INSERT 时返回 500。
-- MODIFY COLUMN MEDIUMTEXT NULL 可重复执行,不会清空或重写已有正文数据。
ALTER TABLE teaching_plan
MODIFY COLUMN course_type VARCHAR(16) NOT NULL,
MODIFY COLUMN applicable_course VARCHAR(200) NOT NULL,
......@@ -207,7 +211,9 @@ BEGIN
MODIFY COLUMN chapter_topic VARCHAR(50) NOT NULL,
MODIFY COLUMN duration_minutes INT NOT NULL,
MODIFY COLUMN class_name VARCHAR(200) NOT NULL,
MODIFY COLUMN teaching_purpose MEDIUMTEXT NOT NULL;
MODIFY COLUMN teaching_purpose MEDIUMTEXT NOT NULL,
MODIFY COLUMN key_points MEDIUMTEXT NULL,
MODIFY COLUMN difficult_points MEDIUMTEXT NULL;
IF NOT EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema = DATABASE() AND table_name = 'teaching_plan' AND index_name = 'idx_teaching_plan_teacher_preparation') THEN
ALTER TABLE teaching_plan ADD INDEX idx_teaching_plan_teacher_preparation (teacher_id, del_flag, preparation_date);
......
......@@ -186,10 +186,15 @@
## 6. 数据库升级
新部署和旧环境均执行 `src/main/resources/sql/teaching_plan.sql`。脚本会创建缺失表,并通过
`information_schema` 幂等补充原型字段、教学环节子表、管理端审核字段和筛选索引。旧版字段会被保守映射到
新字段:课程名称映射为适用课程、课时数按每课时 45 分钟映射、教学目标映射为教学目的;无法可靠推导的
职业等级、班级等字段使用“未设置”占位,便于管理员后续补录。
部署新版业务服务前,新部署和旧环境均需完整执行
`src/main/resources/sql/teaching_plan.sql`。脚本会创建缺失表,并通过 `information_schema`
幂等补充原型字段、教学环节子表、管理端审核字段和筛选索引。旧版字段会被保守映射到新字段:课程名称映射为
适用课程、课时数按每课时 45 分钟映射、教学目标映射为教学目的;无法可靠推导的职业等级、班级等字段使用
“未设置”占位,便于管理员后续补录。
旧版 `key_points`、`difficult_points` 曾定义为非空字段,而新版页面中的教学重点和教学难点均为可选项。
迁移会显式将这两列调整为可空,并保留已有内容;否则教师留空保存时会在数据库插入阶段失败。迁移脚本可重复执行,
数据库升级完成后可通过 `information_schema.columns` 确认两列的 `IS_NULLABLE` 均为 `YES`。
管理端审核字段包括:
......
......@@ -23,7 +23,7 @@ class StudentLevelCertMapperXmlTest {
@Test
void keywordShouldFuzzyMatchVisibleIdentityFields() throws Exception {
StudentLevelCertDTO query = new StudentLevelCertDTO();
query.setKeyword("王");
query.setName("王");
String sql = compactSql(boundSql(query).getSql());
......
......@@ -32,6 +32,7 @@ import java.util.Date;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
......@@ -128,6 +129,30 @@ class TeachingPlanServiceImplTest {
assertEquals(1, stepCaptor.getValue().getSequenceNo());
}
@Test
void createShouldPersistNullForBlankOptionalKeyAndDifficultyFields() {
when(teachingPlanMapper.insert(any(TeachingPlanEntity.class))).thenReturn(1);
when(teachingPlanMapper.selectTeacherDetail(anyString(), eq(TEACHER_ID)))
.thenAnswer(invocation -> {
TeachingPlanVO vo = new TeachingPlanVO();
vo.setId(invocation.getArgument(0));
return vo;
});
when(attachmentMapper.selectByPlanIds(anyList())).thenReturn(Collections.emptyList());
TeachingPlanSaveDTO request = validRequest();
request.setKeyPoints("");
request.setDifficultPoints(" ");
teachingPlanService.create(request, TEACHER_ID);
// 页面允许这两个字段留空,服务层应统一保存为 NULL;数据库迁移负责保证旧表也接受该值。
ArgumentCaptor<TeachingPlanEntity> captor = ArgumentCaptor.forClass(TeachingPlanEntity.class);
verify(teachingPlanMapper).insert(captor.capture());
assertNull(captor.getValue().getKeyPoints());
assertNull(captor.getValue().getDifficultPoints());
}
@Test
void createShouldRejectMissingRequiredContent() {
TeachingPlanSaveDTO request = validRequest();
......
package com.platform.business.sql;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* 教案表结构与历史库迁移脚本回归测试。
*
* <p>新建库直接使用 CREATE TABLE,旧库则会进入存储过程中的 ALTER TABLE;两条路径都必须允许
* 教学重点和教学难点为空,否则教师按页面规则留空时会在数据库插入阶段触发 500。</p>
*/
class TeachingPlanMigrationSqlTest {
@Test
void freshSchemaShouldDeclareOptionalTeachingFieldsNullable() throws Exception {
String sql = normalizedResource("sql/teaching_plan.sql");
// 防止后续维护新建表定义时误把页面可选字段重新收紧为 NOT NULL。
assertTrue(sql.contains("key_points mediumtext null comment '教学重点'"));
assertTrue(sql.contains("difficult_points mediumtext null comment '教学难点'"));
}
@Test
void legacyMigrationShouldRelaxOldRequiredColumns() throws Exception {
String sql = normalizedResource("sql/teaching_plan.sql");
// CREATE TABLE IF NOT EXISTS 不会修改历史表,必须保留显式 MODIFY COLUMN 才能真正修复旧环境。
assertTrue(sql.contains("modify column key_points mediumtext null"));
assertTrue(sql.contains("modify column difficult_points mediumtext null"));
}
/** 读取随应用打包的 SQL,并压缩空白,避免测试依赖排版和换行风格。 */
private static String normalizedResource(String path) throws Exception {
try (InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(path)) {
assertTrue(input != null, "迁移SQL资源必须存在:" + path);
ByteArrayOutputStream output = new ByteArrayOutputStream();
byte[] buffer = new byte[4096];
int length;
while ((length = input.read(buffer)) >= 0) {
output.write(buffer, 0, length);
}
return new String(output.toByteArray(), StandardCharsets.UTF_8)
.toLowerCase()
.replaceAll("\\s+", " ");
}
}
}
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