From 793fa10b96254ee886d8de14088b1b8b6b8747ef Mon Sep 17 00:00:00 2001 From: ssw Date: Fri, 31 Jul 2026 12:01:28 +0800 Subject: [PATCH] auto(e099a090076e): session end @ 2026-07-31T12:01:26 (+11f) --- ssw-tdd5/pom.xml | 30 ---- ssw-tdd5/ssw-tdd5-biz/pom.xml | 26 ---- .../java/ssw/tdd5/mapper/BookingMapper.java | 9 -- .../main/java/ssw/tdd5/mapper/RoomMapper.java | 12 -- .../java/ssw/tdd5/service/BookingService.java | 10 -- .../java/ssw/tdd5/service/RoomService.java | 15 -- ssw-tdd5/ssw-tdd5-controller/pom.xml | 26 ---- .../ssw/tdd5/controller/SiteController.java | 143 ------------------ ssw-tdd5/ssw-tdd5-entity/pom.xml | 25 --- .../java/ssw/tdd5/entity/BookingEntity.java | 30 ---- .../main/java/ssw/tdd5/entity/RoomEntity.java | 29 ---- 11 files changed, 355 deletions(-) delete mode 100644 ssw-tdd5/pom.xml delete mode 100644 ssw-tdd5/ssw-tdd5-biz/pom.xml delete mode 100644 ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/BookingMapper.java delete mode 100644 ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/RoomMapper.java delete mode 100644 ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/BookingService.java delete mode 100644 ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/RoomService.java delete mode 100644 ssw-tdd5/ssw-tdd5-controller/pom.xml delete mode 100644 ssw-tdd5/ssw-tdd5-controller/src/main/java/ssw/tdd5/controller/SiteController.java delete mode 100644 ssw-tdd5/ssw-tdd5-entity/pom.xml delete mode 100644 ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/BookingEntity.java delete mode 100644 ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/RoomEntity.java diff --git a/ssw-tdd5/pom.xml b/ssw-tdd5/pom.xml deleted file mode 100644 index 5fa4a96..0000000 --- a/ssw-tdd5/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - - com.jnpf - ssw-parent - ${revision} - ../pom.xml - - - com.jnpf - ssw-tdd5 - ${project.version} - pom - - - ssw-tdd5-entity - ssw-tdd5-biz - ssw-tdd5-controller - - \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-biz/pom.xml b/ssw-tdd5/ssw-tdd5-biz/pom.xml deleted file mode 100644 index 93dc916..0000000 --- a/ssw-tdd5/ssw-tdd5-biz/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.jnpf - ssw-tdd5 - ${project.version} - - ssw-tdd5-biz - jar - - - - com.jnpf - ssw-tdd5-entity - ${project.version} - - - com.jnpf - ssw-common-biz - ${project.version} - - - \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/BookingMapper.java b/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/BookingMapper.java deleted file mode 100644 index 5867cd5..0000000 --- a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/BookingMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package ssw.tdd5.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ssw.tdd5.entity.BookingEntity; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface BookingMapper extends BaseMapper { -} \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/RoomMapper.java b/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/RoomMapper.java deleted file mode 100644 index 1558c77..0000000 --- a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/mapper/RoomMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package ssw.tdd5.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ssw.tdd5.entity.RoomEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * Room Mapper (走 SswMapperConfig 自动扫描 ssw.*.mapper, 无需 @MapperScan 重复声明) - */ -@Mapper -public interface RoomMapper extends BaseMapper { -} \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/BookingService.java b/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/BookingService.java deleted file mode 100644 index 5fa153d..0000000 --- a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/BookingService.java +++ /dev/null @@ -1,10 +0,0 @@ -package ssw.tdd5.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ssw.tdd5.entity.BookingEntity; -import ssw.tdd5.mapper.BookingMapper; -import org.springframework.stereotype.Service; - -@Service -public class BookingService extends ServiceImpl { -} \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/RoomService.java b/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/RoomService.java deleted file mode 100644 index beb96f2..0000000 --- a/ssw-tdd5/ssw-tdd5-biz/src/main/java/ssw/tdd5/service/RoomService.java +++ /dev/null @@ -1,15 +0,0 @@ -package ssw.tdd5.service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import ssw.tdd5.entity.RoomEntity; -import ssw.tdd5.mapper.RoomMapper; -import org.springframework.stereotype.Service; - -/** - * 会议室台账 Service - * 数据源: 默认走 @DS("tdd5") 由 SswMapperConfig 注入的 dynamic-datasource - * (tdd5 数据源 key 由 dacli app create 自动注册, 见 dacli datasource 命令) - */ -@Service -public class RoomService extends ServiceImpl { -} \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-controller/pom.xml b/ssw-tdd5/ssw-tdd5-controller/pom.xml deleted file mode 100644 index 6026bcc..0000000 --- a/ssw-tdd5/ssw-tdd5-controller/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - com.jnpf - ssw-tdd5 - ${project.version} - - ssw-tdd5-controller - jar - - - - com.jnpf - ssw-tdd5-biz - ${project.version} - - - com.jnpf - ssw-common-controller - ${project.version} - - - \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-controller/src/main/java/ssw/tdd5/controller/SiteController.java b/ssw-tdd5/ssw-tdd5-controller/src/main/java/ssw/tdd5/controller/SiteController.java deleted file mode 100644 index d46694f..0000000 --- a/ssw-tdd5/ssw-tdd5-controller/src/main/java/ssw/tdd5/controller/SiteController.java +++ /dev/null @@ -1,143 +0,0 @@ -package ssw.tdd5.controller; - -import ssw.tdd5.entity.BookingEntity; -import ssw.tdd5.entity.RoomEntity; -import ssw.tdd5.service.BookingService; -import ssw.tdd5.service.RoomService; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.time.LocalDate; -import java.time.ZoneId; -import java.util.*; - -/** - * TDD5 对外展示网站 API (no-spa-page) - * - * 端点前缀: /api/ssw/tdd5 - * 真实端点 (4 个): - * GET /rooms 会议室列表 - * GET /rooms/{id} 会议室详情 - * GET /bookings/today 今日预约 - * POST /bookings 在线快速预约 (写 tdd5booking 表, 走工作流审批) - * - * 安全: - * - GET 类接口对外开放 (公开网站) - * - POST /bookings 走白名单 (nginx 层已确认 /api/ssw/tdd5/** 公开, 用户输入需服务端二次校验 + 限流, 见 docs/tdd5/research.md §C5) - * - 返回字段仅含业务字段, 不暴露 JNPF 系统列 (f_creator_user_id 等) - * - 错误码: 0=成功, 500=失败 - */ -@RestController -@RequestMapping("/api/ssw/tdd5") -@RequiredArgsConstructor -public class SiteController { - - private final RoomService roomService; - private final BookingService bookingService; - - @GetMapping("/rooms") - public Map listRooms() { - List rooms = roomService.list(); - // 过滤删除标记 (软删, JNPF f_delete_mark=1 不返回) - List> data = new ArrayList<>(); - for (RoomEntity r : rooms) { - Map m = new LinkedHashMap<>(); - m.put("f_id", r.getF_id()); - m.put("f_room_code", r.getF_room_code()); - m.put("f_room_name", r.getF_room_name()); - m.put("f_room_type", r.getF_room_type()); - m.put("f_capacity", r.getF_capacity()); - m.put("f_location", r.getF_location()); - m.put("f_equipment", r.getF_equipment()); - m.put("f_room_status", r.getF_room_status()); - m.put("f_remark", r.getF_remark()); - data.add(m); - } - return ok(data); - } - - @GetMapping("/rooms/{id}") - public Map getRoom(@PathVariable("id") String id) { - RoomEntity r = roomService.getById(id); - if (r == null) return err(404, "会议室不存在"); - Map m = new LinkedHashMap<>(); - m.put("f_id", r.getF_id()); - m.put("f_room_code", r.getF_room_code()); - m.put("f_room_name", r.getF_room_name()); - m.put("f_room_type", r.getF_room_type()); - m.put("f_capacity", r.getF_capacity()); - m.put("f_location", r.getF_location()); - m.put("f_equipment", r.getF_equipment()); - m.put("f_room_status", r.getF_room_status()); - m.put("f_remark", r.getF_remark()); - return ok(m); - } - - @GetMapping("/bookings/today") - public Map todayBookings() { - LocalDate today = LocalDate.now(); - Date startOfDay = Date.from(today.atStartOfDay(ZoneId.systemDefault()).toInstant()); - Date endOfDay = Date.from(today.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant()); - // 用 MyBatis-Plus QueryWrapper 查 f_start_time 当日范围 - List all = bookingService.lambdaQuery() - .between(BookingEntity::getF_start_time, startOfDay, endOfDay) - .orderByAsc(BookingEntity::getF_start_time) - .list(); - return ok(all); - } - - @PostMapping("/bookings") - public Map createBooking(@RequestBody Map body) { - // 字段白名单 + 必填校验 - if (body.get("f_meeting_topic") == null || body.get("f_applicant") == null || body.get("f_start_time") == null) { - return err(400, "会议主题/预约人/开始时间为必填"); - } - BookingEntity b = new BookingEntity(); - b.setF_booking_no("B" + System.currentTimeMillis()); // 简单单号 (生产应走 SequenceUtil) - b.setF_meeting_topic(String.valueOf(body.get("f_meeting_topic"))); - b.setF_applicant(String.valueOf(body.get("f_applicant"))); - b.setF_department(strOrNull(body.get("f_department"))); - b.setF_phone(strOrNull(body.get("f_phone"))); - b.setF_room_id(strOrNull(body.get("f_room_id"))); - // start/end: 前端传 ISO 字符串, 服务端 Date 转换 - b.setF_start_time(parseDate(body.get("f_start_time"))); - b.setF_end_time(parseDate(body.get("f_end_time"))); - b.setF_attendees(toInt(body.get("f_attendees"))); - b.setF_remark(strOrNull(body.get("f_remark"))); - b.setF_booking_state("待审批"); // 默认值, 走 tdd5bookingflow 工作流 - bookingService.save(b); - Map data = new LinkedHashMap<>(); - data.put("id", b.getF_id()); - data.put("f_booking_no", b.getF_booking_no()); - return ok(data); - } - - private static String strOrNull(Object o) { return o == null ? null : String.valueOf(o); } - private static Integer toInt(Object o) { - if (o == null) return null; - try { return Integer.parseInt(String.valueOf(o)); } catch (Exception e) { return null; } - } - private static Date parseDate(Object o) { - if (o == null) return null; - try { return Date.from(java.time.LocalDateTime.parse(String.valueOf(o)).atZone(ZoneId.systemDefault()).toInstant()); } - catch (Exception e) { - try { return Date.from(java.time.Instant.parse(String.valueOf(o))); } - catch (Exception e2) { return null; } - } - } - - private static Map ok(Object data) { - Map r = new LinkedHashMap<>(); - r.put("code", 200); - r.put("msg", "ok"); - r.put("data", data); - return r; - } - - private static Map err(int code, String msg) { - Map r = new LinkedHashMap<>(); - r.put("code", code); - r.put("msg", msg); - return r; - } -} \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-entity/pom.xml b/ssw-tdd5/ssw-tdd5-entity/pom.xml deleted file mode 100644 index 39ed38c..0000000 --- a/ssw-tdd5/ssw-tdd5-entity/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - com.jnpf - ssw-tdd5 - ${project.version} - - ssw-tdd5-entity - jar - - - - com.baomidou - mybatis-plus-annotation - - - com.jnpf - ssw-common-entity - ${project.version} - - - \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/BookingEntity.java b/ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/BookingEntity.java deleted file mode 100644 index 6c22c92..0000000 --- a/ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/BookingEntity.java +++ /dev/null @@ -1,30 +0,0 @@ -package ssw.tdd5.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.io.Serializable; -import java.util.Date; - -/** - * TDD5 会议室预约实体 - * - * 对应物理表: tdd5booking - * FK: f_room_id → tdd5room.f_id (由 dacli form update --fields 注入 relationForm; 当前 AI 创建不含) - * 工作流: tdd5bookingflow (startFormId=tdd5booking 表单 id) - */ -@Data -@TableName("tdd5booking") -public class BookingEntity implements Serializable { - private String f_id; - private String f_booking_no; // 预约单号 (string 必填) - private String f_room_id; // FK: 关联 tdd5room.f_id (varchar, 由 BS-新117 修复注入) - private String f_applicant; // 预约人 - private String f_department; // 预约人部门 - private String f_phone; // 联系电话 - private String f_meeting_topic; // 会议主题 - private Date f_start_time; // 开始时间 (datePicker) - private Date f_end_time; // 结束时间 (datePicker) - private Integer f_attendees; // 与会人数 - private String f_booking_state; // 字典: tdd5bookingstate (待审批/已通过/已驳回/已取消) - private String f_remark; -} \ No newline at end of file diff --git a/ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/RoomEntity.java b/ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/RoomEntity.java deleted file mode 100644 index 1c05e73..0000000 --- a/ssw-tdd5/ssw-tdd5-entity/src/main/java/ssw/tdd5/entity/RoomEntity.java +++ /dev/null @@ -1,29 +0,0 @@ -package ssw.tdd5.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import java.io.Serializable; - -/** - * TDD5 会议室台账实体 - * - * 对应物理表: tdd5room (PostgreSQL DB tdd5, dbLinkId=2081671840002990080) - * 表字段: f_id (PK) + f_room_code / f_room_name / f_room_type / f_capacity / f_location / f_equipment / f_room_status / f_remark + JNPF 系统列 (f_creator_time/f_creator_user_id/f_modify_time/f_modify_user_id/f_delete_mark/f_tenant_id/f_flow_id/f_flow_task_id/f_flow_state/f_version) - * 字段命名: f_ 前缀 + snake_case (CLAUDE.md §3.5 强制) - * 类命名: PascalCase 无 appCode 前缀 (CLAUDE.md §3.5) - * 由 dacli form create --ai 自动建表 (snake_case + appCode 前缀 = tdd5room, 不是 room — D-1 评审实测) - */ -@Data -@TableName("tdd5room") -public class RoomEntity implements Serializable { - private String f_id; - private String f_room_code; - private String f_room_name; - private String f_room_type; // 字典: tdd5roomtype (小型/中型/大型/视频会议室) - private java.math.BigDecimal f_capacity; - private String f_location; - private String f_equipment; - private String f_room_status; // 字典: tdd5roomstatus (空闲/占用/维护) - private String f_remark; - // JNPF 系统列省略, 由 @TableField(fill = FieldFill.INSERT) 自动填充 -} \ No newline at end of file