diff --git a/platform-legacy-core/src/main/java/com/dsasp/server/workcalendar/service/WorkCalendarServiceImpl.java b/platform-legacy-core/src/main/java/com/dsasp/server/workcalendar/service/WorkCalendarServiceImpl.java
new file mode 100644
index 0000000..2467548
--- /dev/null
+++ b/platform-legacy-core/src/main/java/com/dsasp/server/workcalendar/service/WorkCalendarServiceImpl.java
@@ -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 工作日历服务实现。
+ *
+ *
旧框架用 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 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 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 values = jdbcTemplate.queryForList(
+ "SELECT EXCEPTDATE FROM " + TABLE
+ + " WHERE EXCEPTDATE >= ? AND EXCEPTDATE < ? ORDER BY EXCEPTDATE",
+ Long.class, startOfDayMillis(from), startOfDayMillis(to.plusDays(1)));
+ List 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 loadWeekends() {
+ Set 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 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 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;
+ }
+}
diff --git a/platform-legacy-core/src/main/resources/META-INF/weekends.properties b/platform-legacy-core/src/main/resources/META-INF/weekends.properties
new file mode 100644
index 0000000..0012f77
--- /dev/null
+++ b/platform-legacy-core/src/main/resources/META-INF/weekends.properties
@@ -0,0 +1,7 @@
+MONDAY=false
+TUESDAY=false
+WEDNESDAY=false
+THURSDAY=false
+FRIDAY=false
+SATURDAY=true
+SUNDAY=true
diff --git a/platform-legacy-core/src/test/java/com/dsasp/server/workcalendar/service/WorkCalendarServiceImplTest.java b/platform-legacy-core/src/test/java/com/dsasp/server/workcalendar/service/WorkCalendarServiceImplTest.java
new file mode 100644
index 0000000..9620bef
--- /dev/null
+++ b/platform-legacy-core/src/test/java/com/dsasp/server/workcalendar/service/WorkCalendarServiceImplTest.java
@@ -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));
+ }
+}
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java
index 0eb90d3..7c956bc 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java
@@ -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 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 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 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": "工作日 周休日/放假 调班上班"
+ },
+ "reload"
+ ],
+ "columns": [
+ {"name": "date", "label": "日期"},
+ {"name": "week", "label": "星期"},
+ {"name": "stateLabel", "label": "状态"},
+ {
+ "type": "mapping",
+ "name": "workDay",
+ "label": "是否工作日",
+ "map": {"true": "是", "false": "否"}
+ },
+ {
+ "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 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();
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/WorkCalendarController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/WorkCalendarController.java
new file mode 100644
index 0000000..8d7d58d
--- /dev/null
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/WorkCalendarController.java
@@ -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;
+
+/**
+ * 工作日历保真端点。
+ *
+ * 旧页面按年度展示 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 year(@RequestParam(value = "year", required = false) Integer year) {
+ int safeYear = safeYear(year);
+ return ok(yearData(safeYear));
+ }
+
+ @PostMapping("/toggle")
+ public Map toggle(@RequestParam(value = "date", required = false) String dateParam,
+ @RequestBody(required = false) Map 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 data = dayRow(day);
+ data.put("toggled", true);
+ data.put("exception", !existed);
+ data.put("workDay", workCalendarService.isWorkDay(day));
+ return ok("切换成功", data);
+ }
+
+ private Map yearData(int year) {
+ LocalDate start = new LocalDate(year, 1, 1);
+ LocalDate end = new LocalDate(year, 12, 31);
+ List exceptionDays = workCalendarService.getExceptionDays(start, end);
+ Set exceptionSet = new HashSet<>();
+ for (LocalDate exceptionDay : exceptionDays) {
+ exceptionSet.add(exceptionDay.toString());
+ }
+ List exceptions = exceptionSet.stream().sorted().toList();
+
+ List