diff --git a/docs/framework定制视图-TODO-2026-06-17.md b/docs/framework定制视图-TODO-2026-06-17.md index 354d050..aba9610 100644 --- a/docs/framework定制视图-TODO-2026-06-17.md +++ b/docs/framework定制视图-TODO-2026-06-17.md @@ -10,7 +10,7 @@ |---|---:|---| | framework 定制视图总数 | 46 | README 总览口径;backlog 表格当前可解析出 45 行,需后续校正缺的 1 行。 | | 已逐功能验收 / 可算 Done | 约 8 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读、短消息、查看审批、我的发起任务。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 | -| 代码已提交但待最终副作用验收 | 约 9 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入;流程监控已补处理明细查看、结束流程和「高级处理」Groovy 执行入口;通用脚本/XML 编辑器已接入第一批页面;设置定时任务提醒人、数据导入下载入口、工作日历已接线。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 | +| 代码已提交但待最终副作用验收 | 约 12 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入;流程监控已补处理明细查看、结束流程和「高级处理」Groovy 执行入口;通用脚本/XML 编辑器已接入第一批页面;设置定时任务提醒人、数据导入下载/执行入口、功能/视图设计器入口、报表宿主、工作日历已接线。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 | | 仍需修或逐功能验收 | 约 38 | 含上面的待验组;大多是通用页已产出,但 engineclass Java delta 未迁移。 | | 剩余工程单元 | 约 28+ | 多视图可复用同一套组件/端点,如脚本编辑器、消息详情、工作流按钮。 | @@ -42,10 +42,12 @@ | 流程选择框 | Implemented / Needs business verification | `ProcessSelectController` 已提供 `/api/process-select/options|search`;转换器已把 `b3070157` 接到 amis `transfer-picker`;`919477da` 流程代理授权已重转重导并从 PARTIAL 转 SUCCESS;浏览器 smoke 可打开弹窗,显示「流程名称/已选流程」和流程名 | 继续验流程代理授权保存闭环:代理类型=指定流程时必填、保存后 `wf_agent_process` 写入/读取一致 | | 审批表单删除 `91ccbba3` | Implemented / Needs page verification | `eip4-platform 1d8a4fe` 已补 `flowable-service` 历史流程删除端点 `/api/flow/process/{processInstanceId}/delete-history`(运行中流程 409)、网关 AMIS 端点 `/api/workflow/process/{processInstanceId}/delete-history`、`ProcessFormRemoveComponent` 查看/删除按钮注入与 CRUD reload 锚点。自动化已过:`FlowControllerTest`、`TodoControllerAmisTest,FlowableClientTest`、`TemplateToAmisConverterTest#engineclass_ProcessFormRemoveComponent_注入查看和删除历史流程按钮`;打包已过:`mvn -q -pl flowable-service package -DskipTests`、`mvn -q -pl platform-app -am package -DskipTests`。 | 重转/导入 `91ccbba3` 后浏览器验收:列表选中已结束流程 → 查看打开只读 ApprovalDrawer;删除成功后列表刷新;运行中流程删除返回 409 且不误删 | | 流程监控 `9f3b5a8b` | Implemented / Needs page verification | `eip4-platform a019af8` 已补 `flowable-service` 运行中流程结束端点 `/api/flow/process/{processInstanceId}/terminate`(已结束流程 409)、网关 AMIS 端点 `/api/workflow/process/{processInstanceId}/terminate` 并回写 `SYS_DATASTATUS=6(作废)`、`ProcessMonitorComponentNew` 注入「处理」和「结束流程」按钮与 CRUD reload 锚点;`eip4-platform 3523007` 已补「高级处理」按钮和 `/api/workflow/process/{processInstanceId}/advanced-script` Groovy 执行入口,绑定 `processid/businessKey/processInstanceId/tableName/currentUser*` 等上下文。「处理」当前复用只读 ApprovalDrawer 承载流程监控明细查看。自动化已过:`FlowControllerTest`、`TodoControllerAmisTest,FlowableClientTest`、`TemplateToAmisConverterTest#engineclass_ProcessMonitorComponentNew_注入处理和结束流程按钮`、`TodoControllerAmisTest` 高级脚本成功/失败、`TemplateToAmisConverterTest` 高级处理按钮;打包已过:`mvn -q -pl flowable-service package -DskipTests`、`mvn -q -pl platform-app -am package -DskipTests`。部署:全量重转 2757 项、导入扫描 2727 项/更新 647 项,HTTP schema 已确认含「高级处理」和 `/advanced-script`。 | 浏览器验收:选中运行中流程 → 处理打开审批详情;结束流程成功后列表刷新且状态回写作废;已结束流程返回 409;高级处理执行只读脚本/失败脚本并确认错误提示、权限与审计口径 | -| 通用脚本/XML 编辑器(第一批) | Implemented / Needs page verification | `eip4-platform 3523007` 新增 `/api/field-editor/load|save`,白名单限制 `RUNSCRIPT/CONVERTSCRIPT/SAVESCRIPT/XML/CONTENTXML/SENDINFO`;转换器已给 `d99b5760` 定义定时任务注入「编辑任务脚本」、`7821ef3b` 数据导入配置注入「编辑转换脚本/编辑保存脚本」、`8b89fd29/d7e12a83/117374e1/de403e76` 功能/视图管理和自定义列表注入 XML「高级配置」。自动化已过:`FieldEditorControllerTest`、`TemplateToAmisConverterTest` 定时任务嵌套 CRUD 和数据导入脚本按钮;打包已过:`mvn -q -pl platform-app -am package -DskipTests`。部署:全量重转 2757 项、导入扫描 2727 项/更新 647 项,HTTP schema 已确认 `d99b5760`、`7821ef3b`、`9f3b5a8b` 按钮与端点存在。 | 浏览器逐页验:打开脚本/XML 弹窗、加载已有值、保存后 DB 字段一致;确认弹窗层级、只读/必填、空值保存和异常提示 | +| 通用脚本/XML 编辑器(第一批) | Implemented / Needs page verification | `eip4-platform 3523007` 新增 `/api/field-editor/load|save`,白名单限制 `RUNSCRIPT/CONVERTSCRIPT/SAVESCRIPT/XML/CONTENTXML/SENDINFO`;转换器已给 `d99b5760` 定义定时任务注入「编辑任务脚本」、`7821ef3b` 数据导入配置注入「编辑转换脚本/编辑保存脚本」、`8b89fd29/d7e12a83/117374e1/de403e76` 功能/视图管理和自定义列表注入 XML「高级配置」。自动化已过:`FieldEditorControllerTest`、`TemplateToAmisConverterTest` 定时任务嵌套 CRUD 和数据导入脚本按钮;打包已过:`mvn -q -pl platform-app -am package -DskipTests`。部署:全量重转 2757 项、导入扫描 2727 项/更新 647 项,HTTP schema 已确认 `d99b5760`、`7821ef3b`、`9f3b5a8b` 按钮与端点存在。本次 P2 又给功能/视图管理四个页面补了设计器入口,浏览器 smoke 已确认 `8b89fd29` 页面可见「编辑模板/高级配置」。 | 浏览器逐页验:打开脚本/XML 弹窗、加载已有值、保存后 DB 字段一致;确认弹窗层级、只读/必填、空值保存和异常提示 | | 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 待做 | +| 功能/视图管理设计入口 `8b89fd29/d7e12a83/117374e1/de403e76` | Implemented / Browser smoke verified | 本次待提交:转换器给 `UserFunDesignComponent/UserPageDesignComponent` 注入「编辑模板/编辑页面」并打开现有 `/editor.html?templateId=${selectedItems[0].}`;给自定义列表 `UserFunDesignCustomComponent/UserPageDesignCustomComponent` 按底层 `TEMPLATEID/PAGEID` 打开设计器,避免用自定义行主键。自动化:`TemplateToAmisConverterTest#engineclass_功能和视图管理注入设计器入口`、`#engineclass_功能和视图自定义列表设计器入口使用底层模板和页面Id`。部署:全量重转 2757 项、导入扫描 2727 项/更新 644 项;HTTP schema 已确认四页入口均存在;内置浏览器 smoke:`8b89fd29` 可见「编辑模板/高级配置」。 | 页面副作用验收:选中真实功能/视图行后打开设计器,编辑保存后 overlay/schema 变化可回读;自定义列表确认打开的是底层 `TEMPLATEID/PAGEID` 对应设计器 | +| 数据导入配置/文件管理 `7821ef3b/1d132d4a` | Implemented / Browser smoke verified | `eip4-platform c9e4d35` 新增 `/api/dataimport/template?configId=...` 和 `/api/dataimport/basedata`,用 SpreadsheetML 2003 输出 Excel/WPS 可打开的 `.xls`;本次待提交新增 `DataImportExecuteController`、`DataImportExecutionService`、`DataImportExcelParser`、`DataImportScriptHelper`,支持 SpreadsheetML/Excel 解析、zip 内首个 Excel、旧 `CONVERTSCRIPT/SAVESCRIPT` Groovy、`findUser/findCompany/findDepart/findProject/findUnitProject/findProjectCompany/findUserOrg/findUserDepart/findUserPosition/savePo/saveDoc/saveWf/execSql`,`saveWf` 同步写旧 `wf_hi_*`、Flowable `act_hi_*` 和 `sys_datastatus`。转换器给 `DataImportConfigView` 注入「下载模板/下载基础数据」,给 `DataExcelImportView` 注入「执行」。自动化:`DataImportConfigControllerTest`、`DataImportExcelParserTest`、`DataImportExecuteControllerTest`、`TemplateToAmisConverterTest#engineclass_DataExcelImportView_注入执行按钮`;HTTP smoke:`7821ef3b` schema 含下载端点,`1d132d4a` schema 含「执行」和 `/api/dataimport/execute`,`POST /api/dataimport/execute?fileId=NO_SUCH_FILE` 返回业务 422;内置浏览器 smoke:`1d132d4a` 可见「执行」。 | 业务验收:选中配置后下载模板文件可打开且列符合实体;基础数据文件可打开且含公司/用户/部门/工程 sheet;准备一份非生产导入文件,点击「执行」后确认目标业务表、附件、流程历史与 `sys_datastatus` 写入一致 | +| 报表 `e81454af-0e0e-4c0d-add8-db434f198936` | Implemented / Browser smoke verified | 本次待提交新增 `ReportMenuController` `/api/report/menu-tree`,按旧 `ReportComponent` 的 DOCUMENT 菜单树口径从 `VIEW_SYS_MENU` 构建父菜单/类型/报表三级树,并只返回 `sys_page_schema` 已有的可路由叶子;`PageSchemaController` 对报表 templateId 提供内置宿主 schema,左侧树选择叶子后右侧用 `/api/page/schema/${reportTemplateId}?format=amis` 复用已转换页。自动化:`ReportMenuControllerTest`、`PageSchemaControllerTest#reportHostBuiltinSchemaFallback`;HTTP smoke:`/api/report/menu-tree` 返回 110 个叶子,宿主 schema 200 且含 `/api/report/menu-tree`、`report-schema-host`;内置浏览器 smoke:报表页显示 DOCUMENT 菜单树和「请选择左侧报表」。 | 页面副作用验收:逐类选择 3-5 个真实报表叶子,确认右侧报表页 schema 加载、查询条件、分页和导出/打印等报表专属动作是否需要继续迁移 | | 工作日历 `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 中按行/上下文控制 | @@ -58,16 +60,18 @@ ## P2(中等 delta,可批量复用) +> 2026-06-18:P2 缺实现项已清零;下表只保留仍需业务副作用验收的页面闭环。 + | 范围 | 视图 | 要补什么 | 复用点 | |---|---|---|---| | 脚本/XML 编辑器 | 定义定时任务、数据导入配置、流程监控高级处理、功能/视图编辑列表-自定义 | 第一批已接线;按字段保存 `RUNSCRIPT` / `CONVERTSCRIPT` / `SAVESCRIPT` / XML;待页面保存副作用验收 | 一个组件多处接线 | -| 功能管理 / 视图管理 | `8b89fd29`, `d7e12a83` | 高级配置 XML 已接线;左树到右 grid 实体分类级联已恢复;仍缺编辑模板/可视化设计器入口和页面级验收 | 机制① mutator + 设计中心/overlay | -| 功能编辑列表-自定义 / 视图编辑列表-自定义 | `117374e1`, `de403e76` | 高级配置 XML 已接线;仍缺按 type 打开设计器 | 同设计器/编辑器能力 | +| 功能管理 / 视图管理 | `8b89fd29`, `d7e12a83` | 高级配置 XML、左树到右 grid 实体分类级联、编辑模板/可视化设计器入口均已接线;待页面保存副作用验收 | 机制① mutator + 设计中心/overlay | +| 功能编辑列表-自定义 / 视图编辑列表-自定义 | `117374e1`, `de403e76` | 高级配置 XML、按底层 `TEMPLATEID/PAGEID` 打开设计器均已接线;待页面保存副作用验收 | 同设计器/编辑器能力 | | 定义定时任务 | `d99b5760` | 编辑任务脚本已接线;左树到右 grid 实体分类级联已恢复;仍缺页面保存副作用验收 | 级联 + code-editor | | 设置定时任务 | `70f85b21` | 设置提醒人已接线;仍缺页面保存副作用验收 | 用户选择框 + UserTable 规则 | -| 数据导入配置管理 | `7821ef3b` | 编辑转换/保存脚本、下载模板、下载基础数据已接线;仍缺执行导入和页面下载文件验收 | code-editor + 导入端点 | +| 数据导入配置/文件管理 | `7821ef3b`, `1d132d4a` | 编辑转换/保存脚本、下载模板、下载基础数据、执行导入端点和文件页「执行」按钮已接线;待真实文件导入和下载文件打开验收 | code-editor + 导入端点 | | 工作日历 | `a13fa07f` | 已接线:例外日服务、年度列表、toggle、3 态状态;待用户确认是否必须复刻旧 3x4 月历网格 | 新 bespoke 页 + 旧表 `SYS_CALENDAREXCEPTDAY` | -| 报表 | `e81454af` | DOCUMENT 菜单树;右区按 `VIEW_TEMPLATEID` 路由复用已转换页 | 路由宿主 | +| 报表 | `e81454af-0e0e-4c0d-add8-db434f198936` | DOCUMENT 菜单树和右区按 `VIEW_TEMPLATEID` 路由复用已转换页已接线;待真实报表叶子页面副作用验收 | 路由宿主 | ## P3 / 另案 diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java b/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java index 76f79ff..b09964d 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/EngineclassDelta.java @@ -117,15 +117,21 @@ public final class EngineclassDelta { EngineclassDelta::dataImportSaveScriptButton, EngineclassDelta::dataImportTemplateDownloadButton, EngineclassDelta::dataImportBaseDataDownloadButton); + register("com.dsasp.client.dataimport.view.DataExcelImportView", + EngineclassDelta::dataImportExecuteButton); - // 功能/视图管理与自定义列表:先补高级配置 XML 源码编辑入口;可视化设计器另走独立路由。 + // 功能/视图管理与自定义列表:补高级配置 XML 源码编辑入口,并接入现有 amis-editor 设计器。 register("com.dsasp.client.viewframework.component.UserFunDesignComponent", + EngineclassDelta::viewTemplateDesignButton, EngineclassDelta::viewTemplateXmlButton); register("com.dsasp.client.viewframework.component.UserPageDesignComponent", + EngineclassDelta::viewPageDesignButton, EngineclassDelta::viewPageXmlButton); register("com.dsasp.client.viewframework.component.UserFunDesignCustomComponent", + EngineclassDelta::viewTemplateCustomDesignButton, EngineclassDelta::viewTemplateCustomXmlButton); register("com.dsasp.client.viewframework.component.UserPageDesignCustomComponent", + EngineclassDelta::viewPageCustomDesignButton, EngineclassDelta::viewPageCustomXmlButton); // 消息查看:MessageReceiveView/MessageSendView 在默认 GridTemplateComponent 之上加「查看」按钮。 @@ -591,6 +597,22 @@ public final class EngineclassDelta { return downloadButton("下载基础数据", "fa fa-download", "/api/dataimport/basedata"); } + private static Map dataImportExecuteButton(String pkField) { + Map btn = new LinkedHashMap<>(); + btn.put("type", "button"); + btn.put("id", "执行"); + btn.put("label", "执行"); + btn.put("icon", "fa fa-play"); + btn.put("level", "primary"); + btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}"); + btn.put("confirmText", "确认执行选中的数据导入文件?"); + btn.put("actionType", "ajax"); + btn.put("api", mapOf( + "method", "post", + "url", "/api/dataimport/execute?fileId=" + selectedSingleFieldExpr(pkField))); + return btn; + } + private static Map scheduleJobNotifyButton(String pkField) { String idExpr = selectedSingleFieldExpr(pkField); Map form = mapOf( @@ -742,21 +764,52 @@ public final class EngineclassDelta { "VIEW_TEMPLATE", "VIEW_TEMPLATE_ID", pkField, "XML", "xml"); } + private static Map viewTemplateDesignButton(String pkField) { + return designerButton("编辑模板", "fa fa-magic", + selectedSingleFieldExpr(pkField == null || pkField.isBlank() ? "VIEW_TEMPLATE_ID" : pkField)); + } + private static Map viewPageXmlButton(String pkField) { return fieldEditorButton("高级配置", "fa fa-code", "VIEW_PAGE", "VIEW_PAGE_ID", pkField, "XML", "xml"); } + private static Map viewPageDesignButton(String pkField) { + return designerButton("编辑页面", "fa fa-magic", + selectedSingleFieldExpr(pkField == null || pkField.isBlank() ? "VIEW_PAGE_ID" : pkField)); + } + private static Map viewTemplateCustomXmlButton(String pkField) { return fieldEditorButton("高级配置", "fa fa-code", "VIEW_TEMPLATE_CUSTOM", "VIEW_TEMPLATE_CUSTOM_ID", pkField, "XML", "xml"); } + private static Map viewTemplateCustomDesignButton(String pkField) { + return designerButton("编辑模板", "fa fa-magic", "${selectedItems[0].TEMPLATEID}"); + } + private static Map viewPageCustomXmlButton(String pkField) { return fieldEditorButton("高级配置", "fa fa-code", "VIEW_PAGE_CUSTOM", "VIEW_PAGE_CUSTOM_ID", pkField, "XML", "xml"); } + private static Map viewPageCustomDesignButton(String pkField) { + return designerButton("编辑页面", "fa fa-magic", "${selectedItems[0].PAGEID}"); + } + + private static Map designerButton(String label, String icon, String templateIdExpr) { + Map btn = new LinkedHashMap<>(); + btn.put("type", "button"); + btn.put("id", label); + btn.put("label", label); + btn.put("icon", icon); + btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}"); + btn.put("actionType", "url"); + btn.put("url", "/editor.html?templateId=" + templateIdExpr); + btn.put("blank", true); + return btn; + } + private static Map fieldEditorButton(String label, String icon, String tableName, String idField, String pkField, String fieldName, String language) { diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index f333987..7e65aec 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -48,6 +48,16 @@ class TemplateToAmisConverterTest { return (Map) page.get("body"); } + @SuppressWarnings("unchecked") + private static Map findToolbarButton(Map crud, String label) { + List toolbar = (List) crud.get("headerToolbar"); + return toolbar.stream() + .filter(o -> o instanceof Map && label.equals(((Map) o).get("label"))) + .map(o -> (Map) o) + .findFirst() + .orElseThrow(); + } + /** form.body 现为显式行布局(group 行 + 宽控件行),展平回字段序列供字段级断言用。 */ @SuppressWarnings("unchecked") private static List> flattenFormBody(Map form) { @@ -1221,6 +1231,65 @@ class TemplateToAmisConverterTest { assertEquals("/api/dataimport/template?configId=${selectedItems[0].PM_DEMO_ID}", api.get("url")); } + @Test + @SuppressWarnings("unchecked") + void engineclass_DataExcelImportView_注入执行按钮() { + String xml = ""; + ConversionResult r = converter.convertGraded(xml, null, + "com.dsasp.client.dataimport.view.DataExcelImportView", + "数据导入文件管理", new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + List toolbar = (List) crud.get("headerToolbar"); + Map execute = toolbar.stream() + .filter(o -> o instanceof Map && "执行".equals(((Map) o).get("label"))) + .map(o -> (Map) o).findFirst().orElseThrow(); + + assertEquals("ajax", execute.get("actionType")); + assertEquals("${!selectedItems || selectedItems.length !== 1}", execute.get("disabledOn")); + Map api = (Map) execute.get("api"); + assertEquals("post", api.get("method")); + assertEquals("/api/dataimport/execute?fileId=${selectedItems[0].PM_DEMO_ID}", api.get("url")); + } + + @Test + @SuppressWarnings("unchecked") + void engineclass_功能和视图管理注入设计器入口() { + String xml = ""; + + ConversionResult fun = converter.convertGraded(xml, null, + "com.dsasp.client.viewframework.component.UserFunDesignComponent", + "功能管理", new ArrayList<>(), noPage); + Map funButton = findToolbarButton(body(fun.getSchema()), "编辑模板"); + assertEquals("url", funButton.get("actionType")); + assertEquals("/editor.html?templateId=${selectedItems[0].PM_DEMO_ID}", funButton.get("url")); + assertEquals(true, funButton.get("blank")); + + ConversionResult page = converter.convertGraded(xml, null, + "com.dsasp.client.viewframework.component.UserPageDesignComponent", + "视图管理", new ArrayList<>(), noPage); + Map pageButton = findToolbarButton(body(page.getSchema()), "编辑页面"); + assertEquals("url", pageButton.get("actionType")); + assertEquals("/editor.html?templateId=${selectedItems[0].PM_DEMO_ID}", pageButton.get("url")); + } + + @Test + @SuppressWarnings("unchecked") + void engineclass_功能和视图自定义列表设计器入口使用底层模板和页面Id() { + String xml = ""; + + ConversionResult customFun = converter.convertGraded(xml, null, + "com.dsasp.client.viewframework.component.UserFunDesignCustomComponent", + "功能编辑列表-自定义", new ArrayList<>(), noPage); + Map customFunButton = findToolbarButton(body(customFun.getSchema()), "编辑模板"); + assertEquals("/editor.html?templateId=${selectedItems[0].TEMPLATEID}", customFunButton.get("url")); + + ConversionResult customPage = converter.convertGraded(xml, null, + "com.dsasp.client.viewframework.component.UserPageDesignCustomComponent", + "视图编辑列表-自定义", new ArrayList<>(), noPage); + Map customPageButton = findToolbarButton(body(customPage.getSchema()), "编辑页面"); + assertEquals("/editor.html?templateId=${selectedItems[0].PAGEID}", customPageButton.get("url")); + } + @Test @SuppressWarnings("unchecked") void engineclass_ScheduleJobSettingComponent_注入设置提醒人规则编辑器() { diff --git a/platform-metadata/pom.xml b/platform-metadata/pom.xml index abb9dee..3e124df 100644 --- a/platform-metadata/pom.xml +++ b/platform-metadata/pom.xml @@ -22,6 +22,7 @@ com.github.ben-manes.caffeinecaffeine com.fasterxml.jackson.datatypejackson-datatype-joda + org.apache.poipoi-ooxml5.2.5 org.springframework.bootspring-boot-starter-testtest diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportExcelParser.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportExcelParser.java new file mode 100644 index 0000000..aa3c381 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportExcelParser.java @@ -0,0 +1,273 @@ +package com.eip4.platform.metadata.dataimport; + +import java.io.ByteArrayInputStream; +import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.parsers.DocumentBuilderFactory; + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.FormulaEvaluator; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.joda.time.DateTime; +import org.springframework.stereotype.Component; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * 数据导入 Excel 解析器。 + * + *

旧 DataExcelImportView 只读 HSSF {@code .xls}。EIP4 已经用 SpreadsheetML 2003 生成模板, + * 因此这里同时支持本系统模板 XML 和普通 Excel 工作簿。 + */ +@Component +public class DataImportExcelParser { + + public List> parse(byte[] bytes, String sheetName, Integer firstUsefulRead) { + if (bytes == null || bytes.length == 0) { + return List.of(); + } + int firstRow = firstUsefulRead == null ? 2 : Math.max(0, firstUsefulRead); + if (looksLikeSpreadsheetXml(bytes)) { + return parseSpreadsheetXml(bytes, sheetName, firstRow); + } + return parseWorkbook(bytes, sheetName, firstRow); + } + + private List> parseWorkbook(byte[] bytes, String sheetName, int firstRow) { + try (Workbook workbook = WorkbookFactory.create(new ByteArrayInputStream(bytes))) { + Sheet sheet = (sheetName == null || sheetName.isBlank()) + ? workbook.getSheetAt(0) + : workbook.getSheet(sheetName); + if (sheet == null) { + throw new DataImportException("Excel 中不存在 Sheet: " + sheetName); + } + FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator(); + List headers = workbookHeaders(sheet); + List> rows = new ArrayList<>(); + for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) { + if (i < firstRow) { + continue; + } + Row row = sheet.getRow(i); + if (row == null) { + continue; + } + Map rowMap = new LinkedHashMap<>(); + for (int j = 0; j < headers.size(); j++) { + rowMap.put(headers.get(j), workbookCellValue(row.getCell(j), evaluator)); + } + if (!isBlankRow(rowMap)) { + rows.add(rowMap); + } + } + return rows; + } catch (DataImportException ex) { + throw ex; + } catch (Exception ex) { + throw new DataImportException("解析 Excel 失败: " + ex.getMessage(), ex); + } + } + + private List workbookHeaders(Sheet sheet) { + Row header = sheet.getRow(sheet.getFirstRowNum()); + if (header == null) { + return List.of(); + } + List headers = new ArrayList<>(); + short last = header.getLastCellNum(); + for (int i = Math.max(0, header.getFirstCellNum()); i < last; i++) { + Cell cell = header.getCell(i); + String name = cell == null ? "" : String.valueOf(workbookCellValue(cell, null)).trim(); + if (name.isBlank()) { + break; + } + headers.add(name); + } + return headers; + } + + private Object workbookCellValue(Cell cell, FormulaEvaluator evaluator) { + if (cell == null) { + return null; + } + CellType type = cell.getCellType(); + if (type == CellType.FORMULA && evaluator != null) { + type = evaluator.evaluateFormulaCell(cell); + } + return switch (type) { + case BOOLEAN -> cell.getBooleanCellValue(); + case NUMERIC -> { + if (DateUtil.isCellDateFormatted(cell)) { + Date date = cell.getDateCellValue(); + yield new DateTime(date.getTime()); + } + yield BigDecimal.valueOf(cell.getNumericCellValue()); + } + case STRING -> emptyToNull(cell.getStringCellValue()); + case BLANK, ERROR, _NONE -> null; + case FORMULA -> null; + }; + } + + private List> parseSpreadsheetXml(byte[] bytes, String sheetName, int firstRow) { + try { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setNamespaceAware(true); + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); + Document document = factory.newDocumentBuilder().parse(new ByteArrayInputStream(bytes)); + Element worksheet = selectWorksheet(document, sheetName); + if (worksheet == null) { + throw new DataImportException("Excel XML 中不存在 Sheet: " + sheetName); + } + List> rawRows = spreadsheetRows(worksheet); + if (rawRows.isEmpty()) { + return List.of(); + } + List headers = new ArrayList<>(); + for (Object value : rawRows.get(0)) { + String header = value == null ? "" : String.valueOf(value).trim(); + if (header.isBlank()) { + break; + } + headers.add(header); + } + List> rows = new ArrayList<>(); + for (int i = 0; i < rawRows.size(); i++) { + if (i < firstRow) { + continue; + } + List raw = rawRows.get(i); + Map rowMap = new LinkedHashMap<>(); + for (int j = 0; j < headers.size(); j++) { + rowMap.put(headers.get(j), j < raw.size() ? raw.get(j) : null); + } + if (!isBlankRow(rowMap)) { + rows.add(rowMap); + } + } + return rows; + } catch (DataImportException ex) { + throw ex; + } catch (Exception ex) { + throw new DataImportException("解析 Excel XML 失败: " + ex.getMessage(), ex); + } + } + + private Element selectWorksheet(Document document, String sheetName) { + NodeList list = document.getElementsByTagNameNS("*", "Worksheet"); + if (list.getLength() == 0) { + return null; + } + if (sheetName == null || sheetName.isBlank()) { + return (Element) list.item(0); + } + for (int i = 0; i < list.getLength(); i++) { + Element worksheet = (Element) list.item(i); + String name = worksheet.getAttributeNS("urn:schemas-microsoft-com:office:spreadsheet", "Name"); + if (name == null || name.isBlank()) { + name = worksheet.getAttribute("ss:Name"); + } + if (sheetName.equals(name)) { + return worksheet; + } + } + return null; + } + + private List> spreadsheetRows(Element worksheet) { + List> rows = new ArrayList<>(); + NodeList rowNodes = worksheet.getElementsByTagNameNS("*", "Row"); + for (int i = 0; i < rowNodes.getLength(); i++) { + Element row = (Element) rowNodes.item(i); + List values = new ArrayList<>(); + NodeList children = row.getChildNodes(); + int cellIndex = 0; + for (int j = 0; j < children.getLength(); j++) { + Node node = children.item(j); + if (!(node instanceof Element cell) || !"Cell".equals(cell.getLocalName())) { + continue; + } + int explicitIndex = spreadsheetIndex(cell); + if (explicitIndex > 0) { + while (cellIndex < explicitIndex - 1) { + values.add(null); + cellIndex++; + } + } + values.add(spreadsheetCellValue(cell)); + cellIndex++; + } + rows.add(values); + } + return rows; + } + + private Object spreadsheetCellValue(Element cell) { + NodeList dataNodes = cell.getElementsByTagNameNS("*", "Data"); + if (dataNodes.getLength() == 0) { + return null; + } + Element data = (Element) dataNodes.item(0); + String type = data.getAttributeNS("urn:schemas-microsoft-com:office:spreadsheet", "Type"); + if (type == null || type.isBlank()) { + type = data.getAttribute("ss:Type"); + } + String value = data.getTextContent(); + if (value == null || value.isBlank()) { + return null; + } + return switch (type) { + case "Number" -> new BigDecimal(value.trim()); + case "Boolean" -> "1".equals(value.trim()) || Boolean.parseBoolean(value.trim()); + case "DateTime" -> new DateTime(Instant.parse(value.trim()).toEpochMilli()); + default -> value; + }; + } + + private int spreadsheetIndex(Element cell) { + String raw = cell.getAttributeNS("urn:schemas-microsoft-com:office:spreadsheet", "Index"); + if (raw == null || raw.isBlank()) { + raw = cell.getAttribute("ss:Index"); + } + try { + return raw == null || raw.isBlank() ? -1 : Integer.parseInt(raw.trim()); + } catch (NumberFormatException ex) { + return -1; + } + } + + private boolean looksLikeSpreadsheetXml(byte[] bytes) { + String prefix = new String(bytes, 0, Math.min(bytes.length, 512), StandardCharsets.UTF_8).stripLeading(); + return prefix.startsWith(" rowMap) { + if (rowMap == null || rowMap.isEmpty()) { + return true; + } + for (Object value : rowMap.values()) { + if (value != null && !String.valueOf(value).isBlank()) { + return false; + } + } + return true; + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportException.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportException.java new file mode 100644 index 0000000..5adb016 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportException.java @@ -0,0 +1,12 @@ +package com.eip4.platform.metadata.dataimport; + +public class DataImportException extends RuntimeException { + + public DataImportException(String message) { + super(message); + } + + public DataImportException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportExecutionService.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportExecutionService.java new file mode 100644 index 0000000..088d379 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportExecutionService.java @@ -0,0 +1,324 @@ +package com.eip4.platform.metadata.dataimport; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import javax.script.Bindings; +import javax.script.SimpleBindings; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.dsasp.server.common.dataDic.bean.AbstractPOJOInfo; +import com.dsasp.server.common.dataDic.bean.DisplayType; +import com.dsasp.server.common.dataDic.bean.POJOInfo; +import com.dsasp.server.common.exception.ValidationException; +import com.dsasp.server.dataDic.binding.ScriptingEnginesManager; +import com.eip4.platform.metadata.security.IdentifierWhitelist; + +/** + * 数据导入文件执行管线。 + */ +@Service +public class DataImportExecutionService { + + private static final String TABLE_FILE = "SYS_DATAIMPORTFILE"; + private static final String TABLE_CONFIG = "SYS_DATAIMPORTCONFIG"; + + private final JdbcTemplate jdbcTemplate; + private final IdentifierWhitelist whitelist; + private final DataImportExcelParser parser; + private final DataImportScriptHelper helper; + private final Path fileRoot; + + public DataImportExecutionService(JdbcTemplate jdbcTemplate, + IdentifierWhitelist whitelist, + DataImportExcelParser parser, + DataImportScriptHelper helper, + @Value("${eip4.file.root:./data/files}") String fileRoot) { + this.jdbcTemplate = jdbcTemplate; + this.whitelist = whitelist; + this.parser = parser; + this.helper = helper; + this.fileRoot = Paths.get(fileRoot).toAbsolutePath().normalize(); + } + + @Transactional + public ImportResult execute(String fileId) { + if (fileId == null || fileId.isBlank()) { + throw new DataImportException("缺少数据导入文件主键"); + } + DataImportFile file = loadImportFile(fileId.trim()); + DataImportConfig config = loadConfig(file.configId()); + List sources = resolveSources(file); + if (sources.isEmpty()) { + throw new DataImportException("未找到导入文件附件,请先上传 Excel 文件"); + } + + int totalRows = 0; + List filenames = new ArrayList<>(); + int fileIndex = 0; + for (ImportSource source : sources) { + byte[] bytes = readImportBytes(source); + List> rows = parser.parse(bytes, file.sheetName(), file.firstUsefulRead()); + convertMapByEntity(rows, config.entityId()); + runRows(config.convertScript(), config.id(), "convert", rows, file.filepath(), fileIndex, false); + runRows(config.saveScript(), config.id(), "save", rows, file.filepath(), fileIndex, true); + totalRows += rows.size(); + filenames.add(source.filename()); + fileIndex++; + } + + return new ImportResult(config.id(), file.id(), sources.size(), totalRows, filenames); + } + + protected void convertMapByEntity(List> maps, String entityId) { + if (maps == null || maps.isEmpty() || entityId == null || entityId.isBlank()) { + return; + } + String tableName = tableNameForEntity(entityId.trim()); + if (tableName == null || tableName.isBlank()) { + return; + } + POJOInfo poInfo = poInfo(tableName); + if (poInfo == null) { + return; + } + for (Map map : maps) { + for (String key : new ArrayList<>(map.keySet())) { + int index = poInfo.getColumnIndexByName(key); + if (index < 0) { + continue; + } + Object value = map.get(key); + String type = poInfo.getColumnDisplayType(index); + if (value instanceof java.math.BigDecimal bd + && (DisplayType.Integer.equals(type) || DisplayType.ENUMERATE.equals(type))) { + map.put(key, bd.intValue()); + } + if (DisplayType.YesNo.equals(type)) { + if (value instanceof java.math.BigDecimal bd) { + map.put(key, bd.intValue()); + } else if (value instanceof String s) { + String v = s.trim(); + map.put(key, "是".equals(v) || "1".equals(v) || "true".equalsIgnoreCase(v)); + } + } + } + } + } + + protected String tableNameForEntity(String entityId) { + return AbstractPOJOInfo.getTableName(entityId); + } + + protected POJOInfo poInfo(String tableName) { + return AbstractPOJOInfo.getPOInfo(tableName); + } + + private void runRows(String script, String configId, String phase, List> rows, + String filepath, int fileIndex, boolean includeAllRows) { + if (script == null || script.isBlank() || rows == null || rows.isEmpty()) { + return; + } + String executable = scriptPrelude() + "\n" + script; + for (int i = 0; i < rows.size(); i++) { + Map row = rows.get(i); + Bindings bindings = new SimpleBindings(); + bindings.put("helper", helper); + bindings.put("data", row); + bindings.put("_fp_", filepath); + bindings.put("dataindex", fileIndex); + if (includeAllRows) { + bindings.put("alldatas", rows); + } + try { + ScriptingEnginesManager.getScriptingEnginesManager() + .evaluateGroovy("dataimport:" + configId + ":" + phase + ":" + fileIndex + ":" + i, + executable, bindings); + } catch (ValidationException ex) { + throw new DataImportException("第" + (i + 1) + "行出错," + ex.getMessage(), ex); + } catch (RuntimeException ex) { + throw new DataImportException("第" + (i + 1) + "行出错," + ex.getMessage(), ex); + } + } + } + + private String scriptPrelude() { + return """ + findUser = { Object userName -> helper.findUser(userName) } + findCompany = { Object companyName -> helper.findCompany(companyName) } + findDepart = { Object departName -> helper.findDepart(departName) } + findProject = { Object projectName -> helper.findProject(projectName) } + findUnitProject = { Object projectId, Object unitProjectName -> helper.findUnitProject(projectId, unitProjectName) } + findProjectCompany = { Object projectId -> helper.findProjectCompany(projectId) } + findUserOrg = { Object userId -> helper.findUserOrg(userId) } + findUserDepart = { Object userId -> helper.findUserDepart(userId) } + findUserPosition = { Object userId -> helper.findUserPosition(userId) } + savePo = { Object tableName, Object dataMap -> helper.savePo(tableName, dataMap) } + saveDoc = { Object tableName, Object businessKey, Object docName, Object... rest -> + helper.saveDoc(tableName, businessKey, docName, rest != null && rest.length > 0 ? rest[0] : _fp_) + } + saveWf = { Object tableName, Object processName, Object title, Object businessKey, Object initUserId, Object insertTime, Object maps -> + helper.saveWf(tableName, processName, title, businessKey, initUserId, insertTime, maps, data) + } + execSql = { Object sql -> helper.execSql(sql) } + """; + } + + private DataImportFile loadImportFile(String fileId) { + List> rows = jdbcTemplate.queryForList(""" + SELECT sys_dataimportfile_id, configid, sheetname, firstusefulread, filepath + FROM sys_dataimportfile + WHERE sys_dataimportfile_id = ? AND isactive = 1 + """, fileId); + if (rows.isEmpty()) { + throw new DataImportException("数据导入文件不存在或已删除"); + } + Map row = rows.get(0); + String configId = str(row.get("configid")); + if (configId == null) { + throw new DataImportException("数据导入文件未选择配置"); + } + return new DataImportFile(str(row.get("sys_dataimportfile_id")), configId, + str(row.get("sheetname")), intValue(row.get("firstusefulread"), 2), str(row.get("filepath"))); + } + + private DataImportConfig loadConfig(String configId) { + List> rows = jdbcTemplate.queryForList(""" + SELECT sys_dataimportconfig_id, entityid, convertscript, savescript + FROM sys_dataimportconfig + WHERE sys_dataimportconfig_id = ? AND isactive = 1 + """, configId); + if (rows.isEmpty()) { + throw new DataImportException("数据导入配置不存在或已删除"); + } + Map row = rows.get(0); + String entityId = str(row.get("entityid")); + if (entityId == null) { + throw new DataImportException("数据导入配置未选择实体"); + } + String tableName = tableNameForEntity(entityId); + if (tableName != null && !tableName.isBlank()) { + whitelist.requireLegalTable(tableName); + } + return new DataImportConfig(str(row.get("sys_dataimportconfig_id")), entityId, + str(row.get("convertscript")), str(row.get("savescript"))); + } + + private List resolveSources(DataImportFile file) { + List sources = new ArrayList<>(); + List> docs = jdbcTemplate.queryForList(""" + SELECT sys_doc_id, filename, filepath + FROM sys_doc + WHERE tablename = 'SYS_DATAIMPORTFILE' AND rtrim(businesskey) = ? AND isactive = 1 + ORDER BY createtime + """, file.id()); + for (Map doc : docs) { + Path path = resolveStoredPath(str(doc.get("filepath"))); + if (path != null && Files.exists(path)) { + sources.add(new ImportSource(str(doc.get("sys_doc_id")), str(doc.get("filename")), path)); + } + } + Path fallback = resolveStoredPath(file.filepath()); + if (fallback != null && Files.exists(fallback)) { + sources.add(new ImportSource(file.id(), fallback.getFileName().toString(), fallback)); + } + return sources; + } + + private Path resolveStoredPath(String rawPath) { + String raw = str(rawPath); + if (raw == null) { + return null; + } + Path direct = Paths.get(raw).normalize(); + if (direct.isAbsolute() && Files.exists(direct)) { + return direct; + } + String relative = raw.replace('\\', '/').replaceFirst("^/+", ""); + return fileRoot.resolve(relative).normalize(); + } + + private byte[] readImportBytes(ImportSource source) { + try { + byte[] bytes = Files.readAllBytes(source.path()); + if (!isZip(bytes)) { + return bytes; + } + try (ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(bytes))) { + ZipEntry entry; + while ((entry = zip.getNextEntry()) != null) { + if (entry.isDirectory()) { + continue; + } + ByteArrayOutputStream out = new ByteArrayOutputStream(); + zip.transferTo(out); + return out.toByteArray(); + } + } + throw new DataImportException("ZIP 中没有可导入的 Excel 文件: " + source.filename()); + } catch (IOException ex) { + throw new DataImportException("读取导入文件失败: " + source.filename(), ex); + } + } + + private boolean isZip(byte[] bytes) { + return bytes != null && bytes.length >= 4 + && bytes[0] == 'P' && bytes[1] == 'K'; + } + + private static String str(Object value) { + if (value == null) { + return null; + } + String s = String.valueOf(value).trim(); + return s.isBlank() ? null : s; + } + + private static int intValue(Object value, int fallback) { + if (value instanceof Number n) { + return n.intValue(); + } + try { + String s = str(value); + return s == null ? fallback : Integer.parseInt(s); + } catch (NumberFormatException ex) { + return fallback; + } + } + + public record ImportResult(String configId, String fileId, int fileCount, int rowCount, List filenames) { + public Map toMap() { + Map data = new LinkedHashMap<>(); + data.put("configId", configId); + data.put("fileId", fileId); + data.put("fileCount", fileCount); + data.put("rowCount", rowCount); + data.put("filenames", filenames); + return data; + } + } + + private record DataImportFile(String id, String configId, String sheetName, Integer firstUsefulRead, + String filepath) { + } + + private record DataImportConfig(String id, String entityId, String convertScript, String saveScript) { + } + + private record ImportSource(String id, String filename, Path path) { + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportScriptHelper.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportScriptHelper.java new file mode 100644 index 0000000..26f46d4 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/dataimport/DataImportScriptHelper.java @@ -0,0 +1,449 @@ +package com.eip4.platform.metadata.dataimport; + +import java.sql.Timestamp; +import java.time.Instant; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; + +import org.joda.time.DateTime; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import com.dsasp.server.common.dataDic.service.POJOCRUDService; +import com.dsasp.server.common.user.service.LoggedInUser; +import com.dsasp.server.common.util.UserSession; +import com.eip4.platform.metadata.security.IdentifierWhitelist; + +/** + * 数据导入脚本函数库,承接旧 ScriptFunctions 的业务函数。 + */ +@Component +public class DataImportScriptHelper { + + static final String TASK_USER = "user"; + static final String TASK_DATE = "date"; + + private final JdbcTemplate jdbcTemplate; + private final POJOCRUDService pojoCRUDService; + private final IdentifierWhitelist whitelist; + + public DataImportScriptHelper(JdbcTemplate jdbcTemplate, + POJOCRUDService pojoCRUDService, + IdentifierWhitelist whitelist) { + this.jdbcTemplate = jdbcTemplate; + this.pojoCRUDService = pojoCRUDService; + this.whitelist = whitelist; + } + + public String findUser(Object userName) { + String value = trim(userName); + if (value == null) { + return null; + } + return firstString(""" + SELECT sys_user_id FROM sys_user + WHERE trim(account) || '(' || trim(name) || ')' = ? + OR trim(name) = ? + OR trim(account) = ? + ORDER BY account + LIMIT 1 + """, value, value, value); + } + + public String findUserOrg(Object userId) { + return firstString("SELECT userorgid FROM sys_user WHERE sys_user_id = ? LIMIT 1", trim(userId)); + } + + public String findUserDepart(Object userId) { + return firstString("SELECT masterdepart FROM sys_user WHERE sys_user_id = ? LIMIT 1", trim(userId)); + } + + public String findUserPosition(Object userId) { + return firstString("SELECT masterposition FROM sys_user WHERE sys_user_id = ? LIMIT 1", trim(userId)); + } + + public String findCompany(Object companyName) { + String value = trim(companyName); + if (value == null) { + return null; + } + return firstString("SELECT sys_org_id FROM sys_org WHERE trim(name) = ? LIMIT 1", value); + } + + public String findDepart(Object departName) { + String value = trim(departName); + if (value == null) { + return null; + } + return firstString(""" + SELECT sys_depart_id FROM sys_depart + WHERE trim(fullname) = ? OR trim(name) = ? + ORDER BY fullname + LIMIT 1 + """, value, value); + } + + public String findProject(Object projectName) { + String value = trim(projectName); + if (value == null || !tableExists("pm_project")) { + return null; + } + return firstString("SELECT pm_project_id FROM pm_project WHERE trim(projectname) = ? LIMIT 1", value); + } + + public String findUnitProject(Object projectId, Object unitProjectName) { + String pid = trim(projectId); + String name = trim(unitProjectName); + if (pid == null || name == null || !tableExists("pm_unitproject")) { + return null; + } + return firstString(""" + SELECT pm_unitproject_id FROM pm_unitproject + WHERE projectid = ? AND trim(unitprojectname) = ? + LIMIT 1 + """, pid, name); + } + + public String findProjectCompany(Object projectId) { + String pid = trim(projectId); + if (pid == null || !tableExists("pm_project")) { + return null; + } + return firstString("SELECT filiale FROM pm_project WHERE pm_project_id = ? LIMIT 1", pid); + } + + public void savePo(Object tableName, Object dataMap) { + String table = normalizeTable(tableName); + if (!(dataMap instanceof Map raw)) { + throw new DataImportException("savePo 需要 Map 数据"); + } + Map data = new LinkedHashMap<>(); + raw.forEach((k, v) -> { + if (k != null) { + data.put(String.valueOf(k).toUpperCase(Locale.ROOT), v); + } + }); + pojoCRUDService.save(data, table, currentCtx()); + } + + public void saveDoc(Object tableName, Object businessKey, Object docName, Object filepath) { + String table = normalizeTable(tableName); + String key = trim(businessKey); + String names = trim(docName); + if (key == null || names == null) { + return; + } + String fp = trim(filepath); + for (String part : names.replace(';', ';').split(";")) { + String filename = part.trim(); + if (filename.isBlank() || !filename.contains(".")) { + continue; + } + String ext = filename.substring(filename.lastIndexOf('.') + 1); + String path = docPath(table, key, filename, fp); + long now = System.currentTimeMillis(); + jdbcTemplate.update(""" + INSERT INTO sys_doc(createby, createtime, updateby, updatetime, isactive, version, + sys_doc_id, tablename, businesskey, filename, fileext, filesize, filepath, md5hash) + VALUES (?, ?, ?, ?, 1, 0, ?, ?, ?, ?, ?, 0, ?, '') + """, + LoggedInUser.ADMIN, now, LoggedInUser.ADMIN, now, + UUID.randomUUID().toString(), table, key, filename, ext, path); + } + } + + public void execSql(Object sqlObject) { + String sql = trim(sqlObject); + if (sql == null) { + return; + } + for (String statement : sql.split(";")) { + String s = statement.trim(); + if (s.isBlank()) { + continue; + } + String lower = s.toLowerCase(Locale.ROOT); + if (!lower.startsWith("update ") && !lower.startsWith("insert ") && !lower.startsWith("delete ")) { + throw new DataImportException("execSql 仅允许 UPDATE/INSERT/DELETE: " + firstLine(s)); + } + jdbcTemplate.update(s); + } + } + + public void saveWf(Object tableName, Object processName, Object title, Object businessKey, + Object initUserId, Object insertTime, Object maps, Map data) { + String table = normalizeTable(tableName); + String business = trim(businessKey); + String process = trim(processName); + String t = trim(title); + String starter = trim(initUserId); + if (business == null || process == null || starter == null) { + throw new DataImportException("saveWf 参数不完整"); + } + DateTime start = toDateTime(insertTime); + if (start == null) { + throw new DataImportException("流程开始时间不能为空"); + } + List> taskMaps = normalizeTaskMaps(maps); + if (taskMaps.isEmpty()) { + taskMaps = findWfUserMap(data); + } + DateTime end = taskMaps.isEmpty() ? start : toDateTime(taskMaps.get(taskMaps.size() - 1).get(TASK_DATE)); + if (end == null) { + throw new DataImportException("流程结束时间不能为空"); + } + String processId = UUID.randomUUID().toString(); + insertLegacyWf(processId, table, process, t, business, starter, start, end, taskMaps); + insertFlowableHistory(processId, process, t, business, starter, start, end, taskMaps); + upsertDataStatus(table, business); + } + + private void insertLegacyWf(String processId, String table, String processName, String title, String businessKey, + String initUserId, DateTime start, DateTime end, List> taskMaps) { + if (!tableExists("wf_hi_procinst") || !tableExists("wf_hi_taskinst")) { + return; + } + jdbcTemplate.update(""" + INSERT INTO wf_hi_procinst(wf_hi_procinst_id, title, processname, inituserid, wfstatus, + starttime, endtime, businesskey) + VALUES (?, ?, ?, ?, 3, ?, ?, ?) + """, processId, title, processName, initUserId, start.getMillis(), end.getMillis(), businessKey); + for (TaskPeriod task : taskPeriods(start, taskMaps)) { + jdbcTemplate.update(""" + INSERT INTO wf_hi_taskinst(wf_hi_taskinst_id, processid, title, taskname, inituserid, + starttime, endtime, duedate, assignee, commenttext) + VALUES (?, ?, ?, '审批人', ?, ?, ?, NULL, ?, NULL) + """, + UUID.randomUUID().toString(), processId, title, initUserId, + task.start().getMillis(), task.end().getMillis(), task.user()); + } + } + + private void insertFlowableHistory(String processId, String processName, String title, String businessKey, + String initUserId, DateTime start, DateTime end, + List> taskMaps) { + if (!tableExists("act_hi_procinst") || !tableExists("act_hi_taskinst")) { + return; + } + String procDefId = truncate("IMPORT:" + processName, 64); + int inserted = jdbcTemplate.update(""" + INSERT INTO act_hi_procinst(id_, proc_inst_id_, business_key_, proc_def_id_, start_time_, end_time_, + duration_, start_user_id_, start_act_id_, end_act_id_, delete_reason_) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'start', 'end', 'data import') + ON CONFLICT (proc_def_id_, business_key_) DO NOTHING + """, + processId, processId, businessKey, procDefId, timestamp(start), timestamp(end), + Math.max(0, end.getMillis() - start.getMillis()), initUserId); + if (inserted == 0) { + return; + } + for (TaskPeriod task : taskPeriods(start, taskMaps)) { + jdbcTemplate.update(""" + INSERT INTO act_hi_taskinst(id_, proc_def_id_, proc_inst_id_, name_, assignee_, + start_time_, end_time_, duration_, delete_reason_) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'completed by data import') + ON CONFLICT (id_) DO NOTHING + """, + UUID.randomUUID().toString(), procDefId, processId, title, task.user(), + timestamp(task.start()), timestamp(task.end()), + Math.max(0, task.end().getMillis() - task.start().getMillis())); + } + } + + private void upsertDataStatus(String table, String businessKey) { + if (!tableExists("sys_datastatus")) { + return; + } + int updated = jdbcTemplate.update(""" + UPDATE sys_datastatus SET datastatus = 3 + WHERE businesskey = ? AND tablename = ? + """, businessKey, table); + if (updated == 0) { + jdbcTemplate.update(""" + INSERT INTO sys_datastatus(businesskey, datastatus, tablename) + VALUES (?, 3, ?) + """, businessKey, table); + } + } + + private List taskPeriods(DateTime insertTime, List> maps) { + List periods = new ArrayList<>(); + DateTime previous = insertTime; + for (Map map : maps) { + String user = trim(map.get(TASK_USER)); + DateTime end = toDateTime(map.get(TASK_DATE)); + if (user == null || end == null) { + continue; + } + periods.add(new TaskPeriod(user, previous, end)); + previous = end; + } + return periods; + } + + private List> findWfUserMap(Map data) { + if (data == null || data.isEmpty()) { + return List.of(); + } + List> maps = new ArrayList<>(); + for (int i = 1; i <= 20; i++) { + Object userRaw = firstValue(data, "WFUSER" + i); + Object dateRaw = firstValue(data, "WFDATE" + i); + if (userRaw == null || dateRaw == null) { + continue; + } + String user = trim(userRaw); + if (user != null && user.contains("(")) { + String resolved = findUser(user); + if (resolved != null) { + user = resolved; + } + } + Map item = new LinkedHashMap<>(); + item.put(TASK_USER, user); + item.put(TASK_DATE, dateRaw); + maps.add(item); + } + return maps; + } + + private List> normalizeTaskMaps(Object maps) { + if (!(maps instanceof List list)) { + return new ArrayList<>(); + } + List> result = new ArrayList<>(); + for (Object item : list) { + if (item instanceof Map raw) { + Map map = new LinkedHashMap<>(); + raw.forEach((k, v) -> { + if (k != null) { + map.put(String.valueOf(k), v); + } + }); + result.add(map); + } + } + return result; + } + + private Object firstValue(Map data, String key) { + if (data.containsKey(key)) { + return data.get(key); + } + String lower = key.toLowerCase(Locale.ROOT); + for (Map.Entry entry : data.entrySet()) { + if (entry.getKey() != null && lower.equals(entry.getKey().toLowerCase(Locale.ROOT))) { + return entry.getValue(); + } + } + return null; + } + + private String normalizeTable(Object tableName) { + String table = trim(tableName); + if (table == null) { + throw new DataImportException("表名不能为空"); + } + table = table.toUpperCase(Locale.ROOT); + whitelist.requireLegalTable(table); + return table; + } + + private String firstString(String sql, Object... args) { + try { + List values = jdbcTemplate.query(sql, (rs, rowNum) -> trim(rs.getString(1)), args); + return values.isEmpty() ? null : values.get(0); + } catch (RuntimeException ex) { + return null; + } + } + + private boolean tableExists(String tableName) { + try { + Boolean exists = jdbcTemplate.queryForObject("SELECT to_regclass(?) IS NOT NULL", + Boolean.class, tableName); + return Boolean.TRUE.equals(exists); + } catch (RuntimeException ex) { + return false; + } + } + + private String docPath(String table, String businessKey, String filename, String fp) { + String base = fp == null || fp.isBlank() ? businessKey : fp.replace('\\', '/'); + return "/" + table + "/" + base + "/" + filename; + } + + private DateTime toDateTime(Object value) { + if (value == null) { + return null; + } + if (value instanceof DateTime dt) { + return dt; + } + if (value instanceof java.util.Date d) { + return new DateTime(d.getTime()); + } + if (value instanceof Number n) { + return new DateTime(n.longValue()); + } + String s = String.valueOf(value).trim(); + if (s.isBlank()) { + return null; + } + try { + return new DateTime(Long.parseLong(s)); + } catch (NumberFormatException ignore) { + // fall through + } + try { + return DateTime.parse(s); + } catch (RuntimeException ignore) { + // fall through + } + try { + return new DateTime(Timestamp.valueOf(s).getTime()); + } catch (RuntimeException ex) { + throw new DataImportException("时间转换错误: " + s); + } + } + + private static Timestamp timestamp(DateTime value) { + return Timestamp.from(Instant.ofEpochMilli(value.getMillis())); + } + + private static String trim(Object value) { + if (value == null) { + return null; + } + String s = String.valueOf(value).trim(); + return s.isBlank() ? null : s; + } + + private static String truncate(String value, int max) { + if (value == null || value.length() <= max) { + return value; + } + return value.substring(0, max); + } + + private static String firstLine(String value) { + int newline = value.indexOf('\n'); + return newline < 0 ? value : value.substring(0, newline); + } + + private static Properties currentCtx() { + Properties bound = UserSession.get(); + if (bound != null) { + return bound; + } + return UserSession.getAdmin(); + } + + private record TaskPeriod(String user, DateTime start, DateTime end) { + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/DataImportExecuteController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/DataImportExecuteController.java new file mode 100644 index 0000000..a9cfea9 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/DataImportExecuteController.java @@ -0,0 +1,62 @@ +package com.eip4.platform.metadata.web; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +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.eip4.platform.metadata.dataimport.DataImportException; +import com.eip4.platform.metadata.dataimport.DataImportExecutionService; + +/** + * 数据导入文件管理自定义「执行」端点。 + */ +@RestController +@RequestMapping("/api/dataimport") +public class DataImportExecuteController { + + private final DataImportExecutionService executionService; + + public DataImportExecuteController(DataImportExecutionService executionService) { + this.executionService = executionService; + } + + @PostMapping("/execute") + public ResponseEntity> execute( + @RequestParam(value = "fileId", required = false) String fileId, + @RequestBody(required = false) Map body) { + String id = fileId; + if ((id == null || id.isBlank()) && body != null && body.get("fileId") != null) { + id = String.valueOf(body.get("fileId")); + } + try { + DataImportExecutionService.ImportResult result = executionService.execute(id); + return ResponseEntity.ok(ok("执行成功", result.toMap())); + } catch (DataImportException ex) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(fail(ex.getMessage())); + } catch (RuntimeException ex) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(fail("执行失败: " + ex.getMessage())); + } + } + + private static Map ok(String msg, Map data) { + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + resp.put("msg", msg); + resp.put("data", data); + return resp; + } + + private static Map fail(String msg) { + Map resp = new LinkedHashMap<>(); + resp.put("status", 1); + resp.put("msg", msg); + return resp; + } +} 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 7c956bc..4f39fd5 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 @@ -62,6 +62,7 @@ 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"; + private static final String REPORT_HOST_TEMPLATE_ID = "e81454af-0e0e-4c0d-add8-db434f198936"; /** 响应头:标明 schema 来源层(overlay / standard) */ public static final String HEADER_SCHEMA_LAYER = "X-Schema-Layer"; @@ -276,9 +277,16 @@ public class PageSchemaController { new com.fasterxml.jackson.databind.ObjectMapper(); private static Map builtinSchemaRow(String templateId) { - if (!WORK_CALENDAR_TEMPLATE_ID.equals(templateId)) { - return null; + if (REPORT_HOST_TEMPLATE_ID.equals(templateId)) { + return builtinReportHostSchemaRow(); } + if (WORK_CALENDAR_TEMPLATE_ID.equals(templateId)) { + return builtinWorkCalendarSchemaRow(); + } + return null; + } + + private static Map builtinWorkCalendarSchemaRow() { int year = java.time.Year.now().getValue(); String schema = """ { @@ -346,6 +354,66 @@ public class PageSchemaController { return row; } + private static Map builtinReportHostSchemaRow() { + String schema = """ + { + "type": "page", + "title": "报表", + "body": { + "type": "grid", + "columns": [ + { + "md": 3, + "columnClassName": "b-r pr-md", + "body": { + "type": "input-tree", + "name": "reportTemplateId", + "label": false, + "source": "/api/report/menu-tree", + "searchable": true, + "onlyLeaf": true, + "initiallyOpen": false, + "showOutline": true, + "heightAuto": false, + "style": {"height": "calc(100vh - 190px)", "overflow": "auto"}, + "placeholder": "搜索报表", + "onEvent": { + "change": { + "actions": [ + {"actionType": "reload", "componentId": "report-schema-host"} + ] + } + } + } + }, + { + "md": 9, + "columnClassName": "pl-md", + "body": [ + { + "type": "tpl", + "visibleOn": "${!reportTemplateId}", + "tpl": "
请选择左侧报表
" + }, + { + "type": "service", + "id": "report-schema-host", + "visibleOn": "${reportTemplateId}", + "schemaApi": "/api/page/schema/${reportTemplateId}?format=amis", + "messages": {"fetchFailed": "报表加载失败"} + } + ] + } + ] + } + } + """; + 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/ReportMenuController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ReportMenuController.java new file mode 100644 index 0000000..7ba85e9 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ReportMenuController.java @@ -0,0 +1,106 @@ +package com.eip4.platform.metadata.web; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 报表宿主左侧菜单树。 + * + *

旧 {@code ReportComponent} 读取 {@code VIEW_SYS_MENU} 中 {@code MENUROOTID=DOCUMENT} + * 的菜单,按父菜单/类型/报表三级构树,叶子节点的 {@code VIEW_TEMPLATEID} 用于右侧加载报表模板。 + */ +@RestController +public class ReportMenuController { + + private static final List EXCLUDED_PARENT_IDS = List.of( + "f0140beb-af2e-4238-8897-7e98e4eb1acf", // 报表系统 + "4e7241a6-33ef-4259-b97a-a7e90decb5dd", // 个人文件柜 + "c7be594b-b3b2-4e9e-adc4-65df8fc12908" // 档案中心 + ); + + private final JdbcTemplate jdbcTemplate; + + public ReportMenuController(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + } + + @GetMapping("/api/report/menu-tree") + public Map menuTree() { + List> rows = jdbcTemplate.queryForList(""" + SELECT m.view_sys_menu_id, + m.name, + trim(m.view_templateid) AS view_templateid, + coalesce(nullif(trim(m.typename), ''), '未分类') AS typename, + coalesce(nullif(trim(m.parentname), ''), '报表') AS parentname, + trim(m.parentid) AS parentid + FROM view_sys_menu m + JOIN sys_page_schema s ON s.template_id = trim(m.view_templateid) + WHERE trim(m.menurootid) = 'DOCUMENT' + AND coalesce(trim(m.view_templateid), '') <> '' + AND trim(m.parentid) NOT IN (?, ?, ?) + ORDER BY parentname, typename, name + """, EXCLUDED_PARENT_IDS.toArray()); + + Map> parentNodes = new LinkedHashMap<>(); + Map> typeNodes = new LinkedHashMap<>(); + for (Map row : rows) { + String parentId = string(row.get("parentid")); + String parentName = string(row.get("parentname")); + String typeName = string(row.get("typename")); + String templateId = string(row.get("view_templateid")); + String menuId = string(row.get("view_sys_menu_id")); + String reportName = string(row.get("name")); + + Map parent = parentNodes.computeIfAbsent(parentId, id -> + node("parent:" + id, parentName, true)); + List> parentChildren = children(parent); + + String typeKey = parentId + "|" + typeName; + Map type = typeNodes.computeIfAbsent(typeKey, key -> { + Map n = node("type:" + key, typeName, true); + parentChildren.add(n); + return n; + }); + + Map leaf = node(templateId, reportName, false); + leaf.put("menuId", menuId); + leaf.put("templateId", templateId); + children(type).add(leaf); + } + + Map data = new LinkedHashMap<>(); + data.put("options", new ArrayList<>(parentNodes.values())); + data.put("total", rows.size()); + + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + resp.put("msg", ""); + resp.put("data", data); + return resp; + } + + private static Map node(String value, String label, boolean branch) { + Map node = new LinkedHashMap<>(); + node.put("value", value); + node.put("label", label); + if (branch) { + node.put("children", new ArrayList>()); + } + return node; + } + + @SuppressWarnings("unchecked") + private static List> children(Map node) { + return (List>) node.computeIfAbsent("children", k -> new ArrayList>()); + } + + private static String string(Object value) { + return value == null ? "" : String.valueOf(value).trim(); + } +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/dataimport/DataImportExcelParserTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/dataimport/DataImportExcelParserTest.java new file mode 100644 index 0000000..1b80986 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/dataimport/DataImportExcelParserTest.java @@ -0,0 +1,35 @@ +package com.eip4.platform.metadata.dataimport; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Test; + +class DataImportExcelParserTest { + + private final DataImportExcelParser parser = new DataImportExcelParser(); + + @Test + void parse_支持本系统生成的spreadsheetMl模板() { + String xml = """ + + + + NAMEENABLED + 名称启用 + 测试1 +
+
+ """; + + List> rows = parser.parse(xml.getBytes(StandardCharsets.UTF_8), "DEMO", 2); + + assertThat(rows).hasSize(1); + assertThat(rows.get(0)).containsEntry("NAME", "测试"); + assertThat(String.valueOf(rows.get(0).get("ENABLED"))).isEqualTo("1"); + } +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/DataImportExecuteControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/DataImportExecuteControllerTest.java new file mode 100644 index 0000000..dcca9b2 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/DataImportExecuteControllerTest.java @@ -0,0 +1,45 @@ +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.when; + +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.springframework.http.ResponseEntity; + +import com.eip4.platform.metadata.dataimport.DataImportException; +import com.eip4.platform.metadata.dataimport.DataImportExecutionService; + +class DataImportExecuteControllerTest { + + private final DataImportExecutionService service = mock(DataImportExecutionService.class); + private final DataImportExecuteController controller = new DataImportExecuteController(service); + + @Test + void execute_成功返回amis状态和统计() { + when(service.execute("FILE1")).thenReturn( + new DataImportExecutionService.ImportResult("CFG1", "FILE1", 1, 3, List.of("a.xls"))); + + ResponseEntity> resp = controller.execute("FILE1", null); + + assertThat(resp.getStatusCode().is2xxSuccessful()).isTrue(); + assertThat(resp.getBody()).containsEntry("status", 0).containsEntry("msg", "执行成功"); + assertThat((Map) resp.getBody().get("data")) + .containsEntry("fileCount", 1) + .containsEntry("rowCount", 3); + } + + @Test + void execute_业务错误返回status1() { + when(service.execute("FILE1")).thenThrow(new DataImportException("未找到导入文件附件")); + + ResponseEntity> resp = controller.execute("FILE1", null); + + assertThat(resp.getStatusCode().value()).isEqualTo(422); + assertThat(resp.getBody()).containsEntry("status", 1) + .containsEntry("msg", "未找到导入文件附件"); + } +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java index f351df9..805381a 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java @@ -38,6 +38,7 @@ 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 REPORT_HOST_TID = "e81454af-0e0e-4c0d-add8-db434f198936"; private static final String SCHEMA = "{\"type\":\"page\",\"title\":\"角色维护\"}"; private static final String SCHEMA_OVERLAY = "{\"type\":\"page\",\"title\":\"角色维护(定制)\"}"; private static final String ETAG_VALUE = "abc123etag"; @@ -168,6 +169,24 @@ class PageSchemaControllerTest { assertEquals("standard", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER)); } + @Test + @DisplayName("4c. 报表宿主 XML 为空时走内置标准 schema fallback") + void reportHostBuiltinSchemaFallback() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForList(anyString(), eq(REPORT_HOST_TID))) + .thenReturn(List.of()) + .thenReturn(List.of()); + PageSchemaController c = new PageSchemaController(jdbc); + + var resp = c.schema(REPORT_HOST_TID, null, null, null); + + assertEquals(HttpStatus.OK, resp.getStatusCode()); + assertTrue(String.valueOf(resp.getBody()).contains("报表")); + assertTrue(String.valueOf(resp.getBody()).contains("/api/report/menu-tree")); + assertTrue(String.valueOf(resp.getBody()).contains("/api/page/schema/${reportTemplateId}?format=amis")); + assertEquals("standard", resp.getHeaders().getFirst(PageSchemaController.HEADER_SCHEMA_LAYER)); + } + @Test @DisplayName("5. SYS_PAGE_SCHEMA 缺失/库异常 → 503") void serviceUnavailable503() { diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ReportMenuControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ReportMenuControllerTest.java new file mode 100644 index 0000000..d50c1cf --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ReportMenuControllerTest.java @@ -0,0 +1,60 @@ +package com.eip4.platform.metadata.web; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.springframework.jdbc.core.JdbcTemplate; + +class ReportMenuControllerTest { + + @Test + @SuppressWarnings("unchecked") + void menuTree_按父分类和类型构建叶子模板树() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForList(anyString(), any(Object[].class))).thenReturn(List.of( + row("m1", "质量报表", "tpl-1", "质量管理", "项目管理", "p1"), + row("m2", "安全报表", "tpl-2", "安全管理", "项目管理", "p1"), + row("m3", "薪资报表", "tpl-3", "薪资管理", "人力资源管理", "p2") + )); + ReportMenuController controller = new ReportMenuController(jdbc); + + Map resp = controller.menuTree(); + + assertThat(resp).containsEntry("status", 0); + Map data = (Map) resp.get("data"); + assertThat(data).containsEntry("total", 3); + List> roots = (List>) data.get("options"); + assertThat(roots).hasSize(2); + + Map project = roots.get(0); + assertThat(project).containsEntry("label", "项目管理").containsEntry("value", "parent:p1"); + List> types = (List>) project.get("children"); + assertThat(types).extracting(t -> t.get("label")).containsExactly("质量管理", "安全管理"); + List> qualityLeaves = (List>) types.get(0).get("children"); + assertThat(qualityLeaves.get(0)) + .containsEntry("label", "质量报表") + .containsEntry("value", "tpl-1") + .containsEntry("templateId", "tpl-1") + .containsEntry("menuId", "m1"); + } + + private static Map row(String id, String name, String templateId, + String typeName, String parentName, String parentId) { + Map row = new LinkedHashMap<>(); + row.put("view_sys_menu_id", id); + row.put("name", name); + row.put("view_templateid", templateId); + row.put("typename", typeName); + row.put("parentname", parentName); + row.put("parentid", parentId); + return row; + } +}