Compare commits
2 Commits
03bf036d87
...
be9d1c8e71
| Author | SHA1 | Date | |
|---|---|---|---|
| be9d1c8e71 | |||
| eafd872271 |
@@ -10,8 +10,8 @@
|
||||
|---|---:|---|
|
||||
| framework 定制视图总数 | 46 | README 总览口径;backlog 表格当前可解析出 45 行,需后续校正缺的 1 行。 |
|
||||
| 已逐功能验收 / 可算 Done | 约 8 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读、短消息、查看审批、我的发起任务。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 |
|
||||
| 代码已提交但待最终副作用验收 | 约 8 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入;流程监控已补处理明细查看、结束流程和「高级处理」Groovy 执行入口;通用脚本/XML 编辑器已接入第一批页面;设置定时任务提醒人和数据导入下载入口已接线。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 |
|
||||
| 仍需修或逐功能验收 | 约 39 | 含上面的 5 个待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 |
|
||||
| 代码已提交但待最终副作用验收 | 约 9 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入;流程监控已补处理明细查看、结束流程和「高级处理」Groovy 执行入口;通用脚本/XML 编辑器已接入第一批页面;设置定时任务提醒人、数据导入下载入口、工作日历已接线。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 |
|
||||
| 仍需修或逐功能验收 | 约 38 | 含上面的待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 |
|
||||
| 剩余工程单元 | 约 28+ | 多视图可复用同一套组件/端点,如脚本编辑器、消息详情、工作流按钮。 |
|
||||
|
||||
## Done(已完成 / 已验收)
|
||||
@@ -46,6 +46,7 @@
|
||||
| TreeGrid 实体分类级联 | Implemented / Needs page verification | `eip4-platform 1ef3de1` 修复 `/api/template/treegrid` 对伪 `rcol=ENTITYTYPE` 的处理:老源码实际是 `ENTITYS -> ENTITYTYPE` 关联过滤,现对白名单 `VIEW_TEMPLATE/VIEW_PAGE/SYS_SCHEDULEJOB` 通过 `view_templateentity/view_pageentity/sys_schedulejobentity` 转成主键 IN,再交给原 `_SEARCH` 流。自动化已过:`TemplateTreeControllerTest`;打包已过:`mvn -q -pl platform-app -am package -DskipTests`;8093 已重启。HTTP smoke:功能管理 `VIEW_TEMPLATE` 节点返回 `total=77`,视图管理 `VIEW_PAGE` 节点返回 `total=75`,定义定时任务 `SYS_SCHEDULEJOB` 节点返回 `total=13`,均 200/status=0。 | 浏览器验收:`8b89fd29`、`d7e12a83`、`d99b5760` 左树点击后右表数据随实体分类变化;新增时默认实体分类/关联实体保存口径仍需页面闭环 |
|
||||
| 设置定时任务 `70f85b21` | Implemented / Needs page verification | `eip4-platform c9e4d35` 新增 `/api/schedulejob/{id}/notify` GET/POST、`/api/schedulejob/dimensions/options`、`/api/schedulejob/project-role-options`,把旧 `SYS_SCHEDULEJOB.SENDINFO` 的 `{"items":[...]}` 拆成 input-table 结构化编辑并保存回旧 JSON;转换器给 `ScheduleJobSettingComponent` 注入「设置提醒人」,用户/部门/岗位/岗位类别使用标准 amis picker。自动化已过:`ScheduleJobNotifyControllerTest`、`TemplateToAmisConverterTest#engineclass_ScheduleJobSettingComponent_注入设置提醒人规则编辑器`;部署:全量重转 2757 项、导入扫描 2727 项/更新 794 项,8093 已重启;HTTP smoke:`/api/schedulejob/NO_SUCH/notify` 返回 200/业务失败,`70f85b21` schema 含「设置提醒人」和 `/api/schedulejob/`。 | 浏览器验收:打开提醒人弹窗、加载已有 `SENDINFO`、新增/修改用户/部门/岗位/维度/项目角色规则后保存,DB JSON 与页面回显一致 |
|
||||
| 数据导入配置管理 `7821ef3b`(下载入口) | Implemented / Needs page verification | `eip4-platform c9e4d35` 新增 `/api/dataimport/template?configId=...` 和 `/api/dataimport/basedata`,用 SpreadsheetML 2003 输出 Excel/WPS 可打开的 `.xls`;转换器给 `DataImportConfigView` 注入「下载模板」「下载基础数据」。自动化已过:`DataImportConfigControllerTest`、`TemplateToAmisConverterTest#engineclass_DataImportConfigView_注入转换和保存脚本编辑按钮`;部署同上;HTTP smoke:`/api/dataimport/basedata` 返回 200 attachment,`7821ef3b` schema 含两个下载按钮和端点。 | 浏览器验收:选中配置后下载模板文件可打开且列符合实体;基础数据文件可打开且含公司/用户/部门/工程 sheet;执行导入仍在 P2 待做 |
|
||||
| 工作日历 `a13fa07f` | Implemented / Browser smoke verified | `eip4-platform eafd872` 新增 `workCalendarService`(bean 名与旧脚本函数一致),复用旧表 `SYS_CALENDAREXCEPTDAY`,实现周末默认休息、例外日双语义(周末调班/工作日放假)、`getNextWorkDay/isWorkDay`;新增 `/api/work-calendar/year` 和 `/api/work-calendar/toggle`;`PageSchemaController` 对 XML 为空的工作日历 templateId 提供内置标准 amis schema,避免菜单 404。自动化已过:`WorkCalendarServiceImplTest`、`WorkCalendarControllerTest`、`PageSchemaControllerTest`;打包:`mvn -q -pl platform-app -am package -DskipTests`;8093 已重启。HTTP smoke:schema 200/X-Schema-Layer=standard,年度 2026 返回 365 行,`2099-01-03` 周末例外日 toggle 写入后回滚;内置浏览器验证 `a13fa07f` 页面显示工作日历、年度查询、日期列表、周休日和切换例外日。 | 用户验收:确认当前 amis 列表式年历是否接受;如必须完全复刻旧 3x4 月历网格,再补视觉布局层;再抽一个真实年份例外日做页面按钮 toggle 后 DB/回显闭环 |
|
||||
| 菜单真入口 | Needs verification | 前端已去硬编码假入口;需确认所有需要的真菜单在 `sys_menu` 中可达 | 用 `/api/menu` 和页面侧栏核对 |
|
||||
| 功能模板下载门控 | Pending | backlog 写了 `VIEW_TEMPLATEID` 非空才显示附件编辑;当前只做了去按钮/改标题 | 决定是否补门控,若补则在 `EngineclassDelta` mutator 中按行/上下文控制 |
|
||||
|
||||
@@ -65,7 +66,7 @@
|
||||
| 定义定时任务 | `d99b5760` | 编辑任务脚本已接线;左树到右 grid 实体分类级联已恢复;仍缺页面保存副作用验收 | 级联 + code-editor |
|
||||
| 设置定时任务 | `70f85b21` | 设置提醒人已接线;仍缺页面保存副作用验收 | 用户选择框 + UserTable 规则 |
|
||||
| 数据导入配置管理 | `7821ef3b` | 编辑转换/保存脚本、下载模板、下载基础数据已接线;仍缺执行导入和页面下载文件验收 | code-editor + 导入端点 |
|
||||
| 工作日历 | `a13fa07f` | 年历网格;例外日 toggle;3 态着色 | 新 bespoke 页,后端服务已在 |
|
||||
| 工作日历 | `a13fa07f` | 已接线:例外日服务、年度列表、toggle、3 态状态;待用户确认是否必须复刻旧 3x4 月历网格 | 新 bespoke 页 + 旧表 `SYS_CALENDAREXCEPTDAY` |
|
||||
| 报表 | `e81454af` | DOCUMENT 菜单树;右区按 `VIEW_TEMPLATEID` 路由复用已转换页 | 路由宿主 |
|
||||
|
||||
## P3 / 另案
|
||||
|
||||
@@ -0,0 +1,192 @@
|
||||
package com.dsasp.server.workcalendar.service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.DateTimeConstants;
|
||||
import org.joda.time.LocalDate;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.dsasp.server.common.user.service.LoggedInUser;
|
||||
import com.dsasp.server.common.util.UserSession;
|
||||
import com.dsasp.server.common.workcalendar.service.WorkCalendarService;
|
||||
|
||||
/**
|
||||
* EIP-3 工作日历服务实现。
|
||||
*
|
||||
* <p>旧框架用 SYS_CALENDAREXCEPTDAY 保存例外日:周末例外=上班日,工作日例外=放假日。
|
||||
* 这里保留同一张表和同一 bean 名,供页面和服务流脚本共同使用。
|
||||
*/
|
||||
@Service("workCalendarService")
|
||||
@Transactional
|
||||
public class WorkCalendarServiceImpl implements WorkCalendarService {
|
||||
|
||||
private static final String TABLE = "SYS_CALENDAREXCEPTDAY";
|
||||
private static final String WEEKEND_RESOURCE = "/META-INF/weekends.properties";
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private final Set<Integer> weekends;
|
||||
|
||||
public WorkCalendarServiceImpl(JdbcTemplate jdbcTemplate) {
|
||||
this.jdbcTemplate = jdbcTemplate;
|
||||
this.weekends = loadWeekends();
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocalDate getNextWorkDay(LocalDate startDate, int workDays) {
|
||||
if (startDate == null) {
|
||||
return null;
|
||||
}
|
||||
int step = workDays < 0 ? -1 : 1;
|
||||
LocalDate current = startDate;
|
||||
for (int i = 0; i < Math.abs(workDays); i++) {
|
||||
current = moveByWorkDay(current, step);
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public List<LocalDate> getExceptionDays(LocalDate startDate, LocalDate endDate) {
|
||||
if (startDate == null || endDate == null) {
|
||||
return List.of();
|
||||
}
|
||||
LocalDate from = startDate.isAfter(endDate) ? endDate : startDate;
|
||||
LocalDate to = startDate.isAfter(endDate) ? startDate : endDate;
|
||||
List<Long> values = jdbcTemplate.queryForList(
|
||||
"SELECT EXCEPTDATE FROM " + TABLE
|
||||
+ " WHERE EXCEPTDATE >= ? AND EXCEPTDATE < ? ORDER BY EXCEPTDATE",
|
||||
Long.class, startOfDayMillis(from), startOfDayMillis(to.plusDays(1)));
|
||||
List<LocalDate> dates = new ArrayList<>();
|
||||
for (Long value : values) {
|
||||
if (value != null) {
|
||||
dates.add(new LocalDate(value));
|
||||
}
|
||||
}
|
||||
return dates;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(LocalDate day) {
|
||||
if (day == null) {
|
||||
return;
|
||||
}
|
||||
jdbcTemplate.update(
|
||||
"DELETE FROM " + TABLE + " WHERE EXCEPTDATE >= ? AND EXCEPTDATE < ?",
|
||||
startOfDayMillis(day), startOfDayMillis(day.plusDays(1)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save(LocalDate day) {
|
||||
if (day == null || containsExceptionDay(day)) {
|
||||
return;
|
||||
}
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUser();
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO " + TABLE
|
||||
+ " (SYS_CALENDAREXCEPTDAY_ID, EXCEPTDATE, CREATETIME, CREATEBY,"
|
||||
+ " UPDATETIME, UPDATEBY, ISACTIVE, VERSION)"
|
||||
+ " VALUES (?, ?, ?, ?, ?, ?, 1, 0)",
|
||||
UUID.randomUUID().toString(), startOfDayMillis(day), now, operator, now, operator);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public boolean containsExceptionDay(LocalDate day) {
|
||||
if (day == null) {
|
||||
return false;
|
||||
}
|
||||
Integer count = jdbcTemplate.queryForObject(
|
||||
"SELECT COUNT(*) FROM " + TABLE + " WHERE EXCEPTDATE >= ? AND EXCEPTDATE < ?",
|
||||
Integer.class, startOfDayMillis(day), startOfDayMillis(day.plusDays(1)));
|
||||
return count != null && count > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isWeekDay(LocalDate day) {
|
||||
return day != null && weekends.contains(day.getDayOfWeek());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isWorkDay(DateTime dt) {
|
||||
return dt != null && isWorkDay(dt.toLocalDate());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public boolean isWorkDay(LocalDate day) {
|
||||
if (day == null) {
|
||||
return false;
|
||||
}
|
||||
boolean exceptionDay = containsExceptionDay(day);
|
||||
return isWeekDay(day) ? exceptionDay : !exceptionDay;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initCalendarCache() {
|
||||
// EIP4 版不使用旧 CalendarCache,直接查库保证页面和脚本读取一致。
|
||||
}
|
||||
|
||||
private LocalDate moveByWorkDay(LocalDate startDate, int step) {
|
||||
LocalDate current = startDate.plusDays(step);
|
||||
while (!isWorkDay(current)) {
|
||||
current = current.plusDays(step);
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
private static long startOfDayMillis(LocalDate day) {
|
||||
return day.toDateTimeAtStartOfDay().getMillis();
|
||||
}
|
||||
|
||||
private static Set<Integer> loadWeekends() {
|
||||
Set<Integer> defaults = new HashSet<>();
|
||||
defaults.add(DateTimeConstants.SATURDAY);
|
||||
defaults.add(DateTimeConstants.SUNDAY);
|
||||
|
||||
Properties properties = new Properties();
|
||||
try (InputStream in = WorkCalendarServiceImpl.class.getResourceAsStream(WEEKEND_RESOURCE)) {
|
||||
if (in == null) {
|
||||
return defaults;
|
||||
}
|
||||
properties.load(in);
|
||||
} catch (IOException ex) {
|
||||
return defaults;
|
||||
}
|
||||
|
||||
Set<Integer> configured = new HashSet<>();
|
||||
addWeekend(configured, properties, "MONDAY", DateTimeConstants.MONDAY);
|
||||
addWeekend(configured, properties, "TUESDAY", DateTimeConstants.TUESDAY);
|
||||
addWeekend(configured, properties, "WEDNESDAY", DateTimeConstants.WEDNESDAY);
|
||||
addWeekend(configured, properties, "THURSDAY", DateTimeConstants.THURSDAY);
|
||||
addWeekend(configured, properties, "FRIDAY", DateTimeConstants.FRIDAY);
|
||||
addWeekend(configured, properties, "SATURDAY", DateTimeConstants.SATURDAY);
|
||||
addWeekend(configured, properties, "SUNDAY", DateTimeConstants.SUNDAY);
|
||||
return configured.isEmpty() ? defaults : configured;
|
||||
}
|
||||
|
||||
private static void addWeekend(Set<Integer> target, Properties properties, String key, int dayOfWeek) {
|
||||
if ("true".equalsIgnoreCase(properties.getProperty(key, "").trim())) {
|
||||
target.add(dayOfWeek);
|
||||
}
|
||||
}
|
||||
|
||||
private static String currentUser() {
|
||||
Properties session = UserSession.get();
|
||||
if (session == null) {
|
||||
return "ADMIN";
|
||||
}
|
||||
String user = session.getProperty(LoggedInUser.CURRENTUSER, "ADMIN").trim();
|
||||
return user.isEmpty() ? "ADMIN" : user;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
MONDAY=false
|
||||
TUESDAY=false
|
||||
WEDNESDAY=false
|
||||
THURSDAY=false
|
||||
FRIDAY=false
|
||||
SATURDAY=true
|
||||
SUNDAY=true
|
||||
@@ -0,0 +1,84 @@
|
||||
package com.dsasp.server.workcalendar.service;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.joda.time.LocalDate;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
|
||||
class WorkCalendarServiceImplTest {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate = mock(JdbcTemplate.class);
|
||||
private final WorkCalendarServiceImpl service = new WorkCalendarServiceImpl(jdbcTemplate);
|
||||
|
||||
@Test
|
||||
void isWorkDay_周末例外日为调班_工作日例外日为放假() {
|
||||
LocalDate saturday = new LocalDate(2026, 6, 20);
|
||||
LocalDate monday = new LocalDate(2026, 6, 22);
|
||||
when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class), anyLong(), anyLong()))
|
||||
.thenReturn(0)
|
||||
.thenReturn(1)
|
||||
.thenReturn(0)
|
||||
.thenReturn(1);
|
||||
|
||||
assertThat(service.isWorkDay(saturday)).isFalse();
|
||||
assertThat(service.isWorkDay(saturday)).isTrue();
|
||||
assertThat(service.isWorkDay(monday)).isTrue();
|
||||
assertThat(service.isWorkDay(monday)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void getNextWorkDay_跳过默认周末() {
|
||||
when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class), anyLong(), anyLong()))
|
||||
.thenReturn(0);
|
||||
|
||||
assertThat(service.getNextWorkDay(new LocalDate(2026, 6, 19), 1))
|
||||
.isEqualTo(new LocalDate(2026, 6, 22));
|
||||
}
|
||||
|
||||
@Test
|
||||
void save_已存在例外日时不重复插入() {
|
||||
when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class), anyLong(), anyLong()))
|
||||
.thenReturn(1);
|
||||
|
||||
service.save(new LocalDate(2026, 6, 19));
|
||||
|
||||
verify(jdbcTemplate).queryForObject(anyString(), eq(Integer.class), anyLong(), anyLong());
|
||||
}
|
||||
|
||||
@Test
|
||||
void save_不存在例外日时插入审计字段() {
|
||||
when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class), anyLong(), anyLong()))
|
||||
.thenReturn(0);
|
||||
|
||||
service.save(new LocalDate(2026, 6, 19));
|
||||
|
||||
verify(jdbcTemplate).update(anyString(), anyString(), anyLong(), anyLong(),
|
||||
anyString(), anyLong(), anyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
void delete_按日期范围删除() {
|
||||
service.delete(new LocalDate(2026, 6, 19));
|
||||
|
||||
verify(jdbcTemplate).update(anyString(), anyLong(), anyLong());
|
||||
}
|
||||
|
||||
@Test
|
||||
void getExceptionDays_把毫秒值转换成LocalDate() {
|
||||
long start = new LocalDate(2026, 6, 19).toDateTimeAtStartOfDay().getMillis();
|
||||
when(jdbcTemplate.queryForList(anyString(), eq(Long.class), anyLong(), anyLong()))
|
||||
.thenReturn(List.of(start));
|
||||
|
||||
assertThat(service.getExceptionDays(new LocalDate(2026, 1, 1), new LocalDate(2026, 12, 31)))
|
||||
.containsExactly(new LocalDate(2026, 6, 19));
|
||||
}
|
||||
}
|
||||
@@ -61,6 +61,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
public class PageSchemaController {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(PageSchemaController.class);
|
||||
private static final String WORK_CALENDAR_TEMPLATE_ID = "a13fa07f-d8c3-46cf-9736-24d6c0e582e3";
|
||||
|
||||
/** 响应头:标明 schema 来源层(overlay / standard) */
|
||||
public static final String HEADER_SCHEMA_LAYER = "X-Schema-Layer";
|
||||
@@ -110,6 +111,10 @@ public class PageSchemaController {
|
||||
"SELECT schema_json::text AS schema_json, schema_etag FROM sys_page_schema WHERE template_id = ?",
|
||||
templateId);
|
||||
} catch (DataAccessException ex) {
|
||||
Map<String, Object> builtin = builtinSchemaRow(templateId);
|
||||
if (builtin != null) {
|
||||
return buildSchemaResponse(builtin, ifNoneMatch, "standard", amisEnvelope);
|
||||
}
|
||||
// SYS_PAGE_SCHEMA 表缺失或库异常 → schema 存储不可用
|
||||
return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
@@ -117,6 +122,10 @@ public class PageSchemaController {
|
||||
}
|
||||
|
||||
if (rows.isEmpty()) {
|
||||
Map<String, Object> builtin = builtinSchemaRow(templateId);
|
||||
if (builtin != null) {
|
||||
return buildSchemaResponse(builtin, ifNoneMatch, "standard", amisEnvelope);
|
||||
}
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND)
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.body("{\"status\":1,\"msg\":\"模板不存在\"}");
|
||||
@@ -266,6 +275,77 @@ public class PageSchemaController {
|
||||
private static final com.fasterxml.jackson.databind.ObjectMapper SCHEMA_MAPPER =
|
||||
new com.fasterxml.jackson.databind.ObjectMapper();
|
||||
|
||||
private static Map<String, Object> builtinSchemaRow(String templateId) {
|
||||
if (!WORK_CALENDAR_TEMPLATE_ID.equals(templateId)) {
|
||||
return null;
|
||||
}
|
||||
int year = java.time.Year.now().getValue();
|
||||
String schema = """
|
||||
{
|
||||
"type": "page",
|
||||
"title": "工作日历",
|
||||
"body": {
|
||||
"type": "crud",
|
||||
"id": "work-calendar-crud",
|
||||
"syncLocation": false,
|
||||
"api": "get:/api/work-calendar/year?year=${year}",
|
||||
"filter": {
|
||||
"title": "查询",
|
||||
"mode": "inline",
|
||||
"wrapWithPanel": true,
|
||||
"body": [
|
||||
{
|
||||
"type": "input-number",
|
||||
"name": "year",
|
||||
"label": "年度",
|
||||
"value": %d,
|
||||
"min": 1900,
|
||||
"max": 2100,
|
||||
"step": 1
|
||||
}
|
||||
]
|
||||
},
|
||||
"headerToolbar": [
|
||||
{
|
||||
"type": "tpl",
|
||||
"tpl": "<span class='label label-default'>工作日</span> <span class='label label-danger'>周休日/放假</span> <span class='label label-info'>调班上班</span>"
|
||||
},
|
||||
"reload"
|
||||
],
|
||||
"columns": [
|
||||
{"name": "date", "label": "日期"},
|
||||
{"name": "week", "label": "星期"},
|
||||
{"name": "stateLabel", "label": "状态"},
|
||||
{
|
||||
"type": "mapping",
|
||||
"name": "workDay",
|
||||
"label": "是否工作日",
|
||||
"map": {"true": "<span class='label label-success'>是</span>", "false": "<span class='label label-danger'>否</span>"}
|
||||
},
|
||||
{
|
||||
"type": "operation",
|
||||
"label": "操作",
|
||||
"buttons": [
|
||||
{
|
||||
"type": "button",
|
||||
"label": "切换例外日",
|
||||
"level": "link",
|
||||
"actionType": "ajax",
|
||||
"api": "post:/api/work-calendar/toggle?date=${date}",
|
||||
"reload": "work-calendar-crud"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
""".formatted(year);
|
||||
Map<String, Object> row = new LinkedHashMap<>();
|
||||
row.put("schema_json", schema);
|
||||
row.put("schema_etag", sha256(schema));
|
||||
return row;
|
||||
}
|
||||
|
||||
/** If-None-Match 可为逗号分隔多值或 {@code *};任一匹配即命中。 */
|
||||
private boolean etagMatches(String ifNoneMatch, String etag) {
|
||||
String header = ifNoneMatch.trim();
|
||||
|
||||
@@ -0,0 +1,201 @@
|
||||
package com.eip4.platform.metadata.web;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.joda.time.LocalDate;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.dsasp.server.common.workcalendar.service.WorkCalendarService;
|
||||
|
||||
/**
|
||||
* 工作日历保真端点。
|
||||
*
|
||||
* <p>旧页面按年度展示 SYS_CALENDAREXCEPTDAY 例外日,并通过点击日期切换例外状态。
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/work-calendar")
|
||||
public class WorkCalendarController {
|
||||
|
||||
private final WorkCalendarService workCalendarService;
|
||||
|
||||
public WorkCalendarController(WorkCalendarService workCalendarService) {
|
||||
this.workCalendarService = workCalendarService;
|
||||
}
|
||||
|
||||
@GetMapping("/year")
|
||||
public Map<String, Object> year(@RequestParam(value = "year", required = false) Integer year) {
|
||||
int safeYear = safeYear(year);
|
||||
return ok(yearData(safeYear));
|
||||
}
|
||||
|
||||
@PostMapping("/toggle")
|
||||
public Map<String, Object> toggle(@RequestParam(value = "date", required = false) String dateParam,
|
||||
@RequestBody(required = false) Map<String, Object> body) {
|
||||
String rawDate = dateParam;
|
||||
if ((rawDate == null || rawDate.isBlank()) && body != null && body.get("date") != null) {
|
||||
rawDate = String.valueOf(body.get("date"));
|
||||
}
|
||||
if (rawDate == null || rawDate.isBlank()) {
|
||||
return fail("缺少日期");
|
||||
}
|
||||
LocalDate day;
|
||||
try {
|
||||
day = LocalDate.parse(rawDate.trim());
|
||||
} catch (IllegalArgumentException ex) {
|
||||
return fail("日期格式应为 YYYY-MM-DD");
|
||||
}
|
||||
|
||||
boolean existed = workCalendarService.containsExceptionDay(day);
|
||||
if (existed) {
|
||||
workCalendarService.delete(day);
|
||||
} else {
|
||||
workCalendarService.save(day);
|
||||
}
|
||||
|
||||
Map<String, Object> data = dayRow(day);
|
||||
data.put("toggled", true);
|
||||
data.put("exception", !existed);
|
||||
data.put("workDay", workCalendarService.isWorkDay(day));
|
||||
return ok("切换成功", data);
|
||||
}
|
||||
|
||||
private Map<String, Object> yearData(int year) {
|
||||
LocalDate start = new LocalDate(year, 1, 1);
|
||||
LocalDate end = new LocalDate(year, 12, 31);
|
||||
List<LocalDate> exceptionDays = workCalendarService.getExceptionDays(start, end);
|
||||
Set<String> exceptionSet = new HashSet<>();
|
||||
for (LocalDate exceptionDay : exceptionDays) {
|
||||
exceptionSet.add(exceptionDay.toString());
|
||||
}
|
||||
List<String> exceptions = exceptionSet.stream().sorted().toList();
|
||||
|
||||
List<Map<String, Object>> days = new ArrayList<>();
|
||||
LocalDate current = start;
|
||||
while (!current.isAfter(end)) {
|
||||
days.add(dayRow(current, exceptionSet.contains(current.toString())));
|
||||
current = current.plusDays(1);
|
||||
}
|
||||
|
||||
List<Map<String, Object>> schedules = new ArrayList<>();
|
||||
for (Map<String, Object> day : days) {
|
||||
if (Boolean.TRUE.equals(day.get("exception"))) {
|
||||
schedules.add(Map.of(
|
||||
"startTime", day.get("date"),
|
||||
"endTime", day.get("date"),
|
||||
"content", day.get("stateLabel"),
|
||||
"className", Boolean.TRUE.equals(day.get("weekend")) ? "bg-info" : "bg-danger"));
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, Object> data = new LinkedHashMap<>();
|
||||
data.put("year", year);
|
||||
data.put("items", days);
|
||||
data.put("total", days.size());
|
||||
data.put("exceptions", exceptions);
|
||||
data.put("schedules", schedules);
|
||||
return data;
|
||||
}
|
||||
|
||||
private Map<String, Object> dayRow(LocalDate day) {
|
||||
boolean weekend = workCalendarService.isWeekDay(day);
|
||||
boolean exception = workCalendarService.containsExceptionDay(day);
|
||||
return dayRow(day, weekend, exception);
|
||||
}
|
||||
|
||||
private Map<String, Object> dayRow(LocalDate day, boolean exception) {
|
||||
boolean weekend = workCalendarService.isWeekDay(day);
|
||||
return dayRow(day, weekend, exception);
|
||||
}
|
||||
|
||||
private static Map<String, Object> dayRow(LocalDate day, boolean weekend, boolean exception) {
|
||||
boolean workDay = weekend ? exception : !exception;
|
||||
String state = state(weekend, exception);
|
||||
Map<String, Object> row = new LinkedHashMap<>();
|
||||
row.put("date", day.toString());
|
||||
row.put("month", day.getMonthOfYear());
|
||||
row.put("day", day.getDayOfMonth());
|
||||
row.put("week", weekLabel(day.getDayOfWeek()));
|
||||
row.put("weekend", weekend);
|
||||
row.put("exception", exception);
|
||||
row.put("workDay", workDay);
|
||||
row.put("state", state);
|
||||
row.put("stateLabel", stateLabel(state));
|
||||
return row;
|
||||
}
|
||||
|
||||
private static int safeYear(Integer year) {
|
||||
int current = java.time.Year.now().getValue();
|
||||
if (year == null) {
|
||||
return current;
|
||||
}
|
||||
if (year < 1900 || year > 2100) {
|
||||
return current;
|
||||
}
|
||||
return year;
|
||||
}
|
||||
|
||||
private static String state(boolean weekend, boolean exception) {
|
||||
if (weekend && exception) {
|
||||
return "makeup";
|
||||
}
|
||||
if (weekend) {
|
||||
return "weekend";
|
||||
}
|
||||
if (exception) {
|
||||
return "holiday";
|
||||
}
|
||||
return "workday";
|
||||
}
|
||||
|
||||
private static String stateLabel(String state) {
|
||||
return switch (state.toLowerCase(Locale.ROOT)) {
|
||||
case "makeup" -> "调班上班";
|
||||
case "weekend" -> "周休日";
|
||||
case "holiday" -> "放假";
|
||||
default -> "工作日";
|
||||
};
|
||||
}
|
||||
|
||||
private static String weekLabel(int dayOfWeek) {
|
||||
return switch (dayOfWeek) {
|
||||
case 1 -> "星期一";
|
||||
case 2 -> "星期二";
|
||||
case 3 -> "星期三";
|
||||
case 4 -> "星期四";
|
||||
case 5 -> "星期五";
|
||||
case 6 -> "星期六";
|
||||
case 7 -> "星期日";
|
||||
default -> "";
|
||||
};
|
||||
}
|
||||
|
||||
private static Map<String, Object> ok(Map<String, Object> data) {
|
||||
return ok("", data);
|
||||
}
|
||||
|
||||
private static Map<String, Object> ok(String msg, Map<String, Object> data) {
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("status", 0);
|
||||
result.put("msg", msg);
|
||||
result.put("data", data);
|
||||
return result;
|
||||
}
|
||||
|
||||
private static Map<String, Object> fail(String msg) {
|
||||
Map<String, Object> result = new LinkedHashMap<>();
|
||||
result.put("status", 1);
|
||||
result.put("msg", msg);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -37,6 +37,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
||||
class PageSchemaControllerTest {
|
||||
|
||||
private static final String TID = "00511ac1-ee64-4ecd-a550-22842ee5be72";
|
||||
private static final String WORK_CALENDAR_TID = "a13fa07f-d8c3-46cf-9736-24d6c0e582e3";
|
||||
private static final String SCHEMA = "{\"type\":\"page\",\"title\":\"角色维护\"}";
|
||||
private static final String SCHEMA_OVERLAY = "{\"type\":\"page\",\"title\":\"角色维护(定制)\"}";
|
||||
private static final String ETAG_VALUE = "abc123etag";
|
||||
@@ -150,6 +151,23 @@ class PageSchemaControllerTest {
|
||||
assertTrue(String.valueOf(resp.getBody()).contains("模板不存在"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("4b. 工作日历 XML 为空时走内置标准 schema fallback")
|
||||
void workCalendarBuiltinSchemaFallback() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
when(jdbc.queryForList(anyString(), eq(WORK_CALENDAR_TID)))
|
||||
.thenReturn(List.of())
|
||||
.thenReturn(List.of());
|
||||
PageSchemaController c = new PageSchemaController(jdbc);
|
||||
|
||||
var resp = c.schema(WORK_CALENDAR_TID, null, null, null);
|
||||
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertTrue(String.valueOf(resp.getBody()).contains("工作日历"));
|
||||
assertTrue(String.valueOf(resp.getBody()).contains("/api/work-calendar/year"));
|
||||
assertEquals("standard", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("5. SYS_PAGE_SCHEMA 缺失/库异常 → 503")
|
||||
void serviceUnavailable503() {
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
package com.eip4.platform.metadata.web;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.joda.time.LocalDate;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import com.dsasp.server.common.workcalendar.service.WorkCalendarService;
|
||||
|
||||
class WorkCalendarControllerTest {
|
||||
|
||||
private final WorkCalendarService service = mock(WorkCalendarService.class);
|
||||
private final WorkCalendarController controller = new WorkCalendarController(service);
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void year_返回年度每日状态和例外日集合() {
|
||||
when(service.getExceptionDays(new LocalDate(2026, 1, 1), new LocalDate(2026, 12, 31)))
|
||||
.thenReturn(List.of(new LocalDate(2026, 6, 20)));
|
||||
when(service.isWeekDay(new LocalDate(2026, 6, 20))).thenReturn(true);
|
||||
when(service.containsExceptionDay(new LocalDate(2026, 6, 20))).thenReturn(true);
|
||||
|
||||
Map<String, Object> resp = controller.year(2026);
|
||||
|
||||
assertThat(resp).containsEntry("status", 0);
|
||||
Map<String, Object> data = (Map<String, Object>) resp.get("data");
|
||||
assertThat(data).containsEntry("year", 2026);
|
||||
assertThat((List<Map<String, Object>>) data.get("items")).hasSize(365);
|
||||
assertThat((List<String>) data.get("exceptions")).containsExactly("2026-06-20");
|
||||
}
|
||||
|
||||
@Test
|
||||
void toggle_存在则删除例外日() {
|
||||
LocalDate day = new LocalDate(2026, 6, 20);
|
||||
when(service.containsExceptionDay(day)).thenReturn(true).thenReturn(false);
|
||||
|
||||
Map<String, Object> resp = controller.toggle("2026-06-20", null);
|
||||
|
||||
assertThat(resp).containsEntry("status", 0);
|
||||
verify(service).delete(day);
|
||||
}
|
||||
|
||||
@Test
|
||||
void toggle_不存在则保存例外日() {
|
||||
LocalDate day = new LocalDate(2026, 6, 20);
|
||||
when(service.containsExceptionDay(day)).thenReturn(false);
|
||||
|
||||
Map<String, Object> resp = controller.toggle(null, Map.of("date", "2026-06-20"));
|
||||
|
||||
assertThat(resp).containsEntry("status", 0);
|
||||
verify(service).save(day);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user