auto(14b5ea1b9bd9): session end @ 2026-07-31T10:31:18 (+11f)
This commit is contained in:
1 parent
3402975a95
commit
3e89ec9b9c
11 files changed
+355
No files matched your search
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<!-- ssw-tdd5 后端业务包 (TDD5 全功能验证, 2026-07-28 落地)
|
||||
- 提供 no-spa-page 网站 (http://nginx/ssw/tdd5/) 所需的 4 个 API
|
||||
- 数据源 key=tdd5 (由 dacli app create 自动注册, JNPF @DS 注解识别)
|
||||
- 表名: tdd5room / tdd5booking / tdd5feedback (snake_case + appCode 前缀)
|
||||
- 集成方式: 在 boot/jnpf-admin/pom.xml 加 ssw-tdd5-controller 依赖, 然后 mvn install 后 jnpf-admin 自动通过 @ComponentScan (JnpfAdminApplication.java:17) 加载
|
||||
-->
|
||||
<parent>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-parent</artifactId>
|
||||
<version>${revision}</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-tdd5</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>ssw-tdd5-entity</module>
|
||||
<module>ssw-tdd5-biz</module>
|
||||
<module>ssw-tdd5-controller</module>
|
||||
</modules>
|
||||
</project>
|
||||
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-tdd5</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</parent>
|
||||
<artifactId>ssw-tdd5-biz</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-tdd5-entity</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-common-biz</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -0,0 +1,9 @@
|
||||
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<BookingEntity> {
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
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<RoomEntity> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
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<BookingMapper, BookingEntity> {
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
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<RoomMapper, RoomEntity> {
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-tdd5</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</parent>
|
||||
<artifactId>ssw-tdd5-controller</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-tdd5-biz</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-common-controller</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -0,0 +1,143 @@
|
||||
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<String, Object> listRooms() {
|
||||
List<RoomEntity> rooms = roomService.list();
|
||||
// 过滤删除标记 (软删, JNPF f_delete_mark=1 不返回)
|
||||
List<Map<String, Object>> data = new ArrayList<>();
|
||||
for (RoomEntity r : rooms) {
|
||||
Map<String, Object> 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<String, Object> getRoom(@PathVariable("id") String id) {
|
||||
RoomEntity r = roomService.getById(id);
|
||||
if (r == null) return err(404, "会议室不存在");
|
||||
Map<String, Object> 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<String, Object> 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<BookingEntity> all = bookingService.lambdaQuery()
|
||||
.between(BookingEntity::getF_start_time, startOfDay, endOfDay)
|
||||
.orderByAsc(BookingEntity::getF_start_time)
|
||||
.list();
|
||||
return ok(all);
|
||||
}
|
||||
|
||||
@PostMapping("/bookings")
|
||||
public Map<String, Object> createBooking(@RequestBody Map<String, Object> 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<String, Object> 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<String, Object> ok(Object data) {
|
||||
Map<String, Object> r = new LinkedHashMap<>();
|
||||
r.put("code", 200);
|
||||
r.put("msg", "ok");
|
||||
r.put("data", data);
|
||||
return r;
|
||||
}
|
||||
|
||||
private static Map<String, Object> err(int code, String msg) {
|
||||
Map<String, Object> r = new LinkedHashMap<>();
|
||||
r.put("code", code);
|
||||
r.put("msg", msg);
|
||||
return r;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-tdd5</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</parent>
|
||||
<artifactId>ssw-tdd5-entity</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.baomidou</groupId>
|
||||
<artifactId>mybatis-plus-annotation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.jnpf</groupId>
|
||||
<artifactId>ssw-common-entity</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -0,0 +1,30 @@
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
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) 自动填充
|
||||
}
|
||||
Reference in new issue
Block a user