From 11dbdaae75ad7c228fe1cdab2ae6bace3414cabb Mon Sep 17 00:00:00 2001 From: SunYF <123@hard_man.com> Date: Thu, 29 Oct 2026 18:16:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=A7=E5=B1=8F=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=B7=A5=E4=BD=8D=E6=BB=9A=E5=8A=A8=E6=A0=8F?= =?UTF-8?q?=E4=B8=8E=E5=A4=9A=E8=AE=A2=E5=8D=95=E8=BD=AE=E6=92=AD=EF=BC=8C?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=8F=8A=E5=BD=BB=E5=BA=95=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E7=95=99=E7=97=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bj_power_dashboard/src/mock.ts | 85 +++ bj_power_dashboard/src/pages/LineModel.css | 13 + bj_power_dashboard/src/pages/LineModel.tsx | 142 +++- .../src/pages/ProductionBoard.tsx | 127 ++-- bj_power_dashboard/src/types.ts | 4 + bj_power_mes/ent/attachment.go | 39 +- bj_power_mes/ent/attachment/attachment.go | 34 + bj_power_mes/ent/attachment/where.go | 185 +++++ bj_power_mes/ent/attachment_create.go | 85 +++ bj_power_mes/ent/attachment_update.go | 142 ++++ bj_power_mes/ent/backuprecord.go | 28 +- bj_power_mes/ent/backuprecord/backuprecord.go | 24 + bj_power_mes/ent/backuprecord/where.go | 140 ++++ bj_power_mes/ent/backuprecord_create.go | 60 ++ bj_power_mes/ent/backuprecord_update.go | 88 +++ bj_power_mes/ent/migrate/schema.go | 7 +- bj_power_mes/ent/mutation.go | 307 ++++++++- bj_power_mes/ent/runtime.go | 28 + .../src/components/AttachmentPanel.vue | 22 +- bj_power_mes/frontend/src/help.js | 22 +- .../frontend/src/layouts/MainLayout.vue | 44 +- .../frontend/src/pages/Attachment.vue | 82 ++- .../frontend/src/pages/DataArchive.vue | 647 +++++++++++++++-- .../frontend/src/pages/LineManagement.vue | 59 +- .../frontend/src/pages/ProcessCard.vue | 521 +++++++------- bj_power_mes/frontend/src/pages/Station.vue | 10 +- bj_power_mes/frontend/src/utils/print.js | 31 + bj_power_mes/internal/backup/backup.go | 203 ++++-- bj_power_mes/internal/backup/records.go | 3 + bj_power_mes/internal/backup/util.go | 162 ++++- bj_power_mes/internal/handler/attachment.go | 93 ++- .../internal/handler/attachment_lifecycle.go | 576 ++++++++++++++++ bj_power_mes/internal/handler/backup.go | 23 + bj_power_mes/internal/handler/perm.go | 9 +- .../internal/handler/production/dock.go | 48 +- .../internal/handler/routes_production.go | 9 + .../internal/logic/alert_backup_overdue.go | 58 ++ bj_power_mes/internal/logic/dashboard.go | 19 +- .../internal/logic/dashboard_front.go | 56 ++ .../internal/logic/dashboard_types.go | 3 + bj_power_mes/internal/logic/processflow.go | 6 + bj_power_mes/internal/logic/settings.go | 5 +- bj_power_mes/public/index.html | 4 +- bj_power_mes/schema/attachment.go | 3 + bj_power_mes/schema/backup_record.go | 9 +- bj_power_wms/ent/attachment.go | 37 +- bj_power_wms/ent/attachment/attachment.go | 24 + bj_power_wms/ent/attachment/where.go | 215 ++++++ bj_power_wms/ent/attachment_create.go | 254 +++++++ bj_power_wms/ent/attachment_update.go | 176 +++++ bj_power_wms/ent/backuprecord.go | 28 +- bj_power_wms/ent/backuprecord/backuprecord.go | 24 + bj_power_wms/ent/backuprecord/where.go | 140 ++++ bj_power_wms/ent/backuprecord_create.go | 140 ++++ bj_power_wms/ent/backuprecord_update.go | 88 +++ bj_power_wms/ent/migrate/schema.go | 9 +- bj_power_wms/ent/mutation.go | 365 +++++++++- bj_power_wms/ent/runtime.go | 14 +- .../src/components/AttachmentPanel.vue | 21 +- bj_power_wms/frontend/src/help.js | 14 +- .../frontend/src/layouts/MainLayout.vue | 42 +- .../frontend/src/pages/AttachmentCenter.vue | 141 ++-- .../frontend/src/pages/DataArchive.vue | 648 ++++++++++++++++-- bj_power_wms/internal/backup/backup.go | 216 ++++-- bj_power_wms/internal/backup/records.go | 3 + bj_power_wms/internal/backup/util.go | 158 ++++- bj_power_wms/internal/handler/attachment.go | 163 +++-- .../internal/handler/attachment_lifecycle.go | 507 ++++++++++++++ bj_power_wms/internal/handler/backup.go | 37 +- bj_power_wms/internal/handler/routes.go | 14 +- bj_power_wms/internal/handler/settings.go | 2 + bj_power_wms/schema/attachment.go | 3 + bj_power_wms/schema/backup_record.go | 9 +- bj_power_wms/web/static/index.html | 4 +- 问题临时.md | 5 + 75 files changed, 6801 insertions(+), 965 deletions(-) create mode 100644 bj_power_mes/internal/handler/attachment_lifecycle.go create mode 100644 bj_power_mes/internal/logic/alert_backup_overdue.go create mode 100644 bj_power_wms/internal/handler/attachment_lifecycle.go diff --git a/bj_power_dashboard/src/mock.ts b/bj_power_dashboard/src/mock.ts index ef485e6..1367e80 100644 --- a/bj_power_dashboard/src/mock.ts +++ b/bj_power_dashboard/src/mock.ts @@ -249,6 +249,31 @@ export function getDemoData(): DashboardData { ], }, equipment: buildStations(), + // 虚拟工位(OFFLINE,不连PLC):产线动态地图右侧滚动栏演示 + virtualStations: [ + { + id: 14, + name: '虚拟工位14', + status: 'running', + scanGun: { status: 'online', processedCount: 6 }, + tighteningGun: { status: 'online', processedCount: 6 }, + currentSn: 'SN202609280014', + currentOperator: '刘洋', + currentProcess: '辅助装配(虚拟)', + doneCount: 6, + }, + { + id: 15, + name: '虚拟工位15', + status: 'idle', + scanGun: { status: 'online', processedCount: 0 }, + tighteningGun: { status: 'online', processedCount: 0 }, + currentSn: '', + currentOperator: '', + currentProcess: '', + doneCount: 0, + }, + ], progress: { orderNo: 'WO-20260825-007', contractNo: 'HT-2026-0825-007', @@ -268,6 +293,66 @@ export function getDemoData(): DashboardData { traceable: true, steps: progressSteps, }, + // 多订单轮播演示:首条与 progress 一致,另补两条在产订单 + progressList: [ + { + orderNo: 'WO-20260825-007', + contractNo: 'HT-2026-0825-007', + productName: '智能电能表 DDS-02', + owner: '张伟', + planStart: fmtDate(planStart), + planEnd: fmtDate(planEnd), + remainDays: daysFromToday(planEnd), + totalQty, + doneQty, + progress: Math.round((doneQty / totalQty) * 100), + processDone: 7, + processTotal: 12, + currentProcess: '工序 8 · 面板固定', + status: '生产中', + traceStepCount: 2016, + traceable: true, + steps: progressSteps, + }, + { + orderNo: 'WO-20260910-012', + contractNo: 'HT-2026-0910-012', + productName: '智能电能表 DDS-03', + owner: '李强', + planStart: fmtDate(planEnd), + planEnd: fmtDate(new Date(planEnd.getTime() + 30 * 86400000)), + remainDays: daysFromToday(new Date(planEnd.getTime() + 30 * 86400000)), + totalQty: 3200, + doneQty: 860, + progress: Math.round((860 / 3200) * 100), + processDone: 4, + processTotal: 12, + currentProcess: '工序 5 · 计量模块装配', + status: '生产中', + traceStepCount: 2016, + traceable: true, + steps: progressSteps, + }, + { + orderNo: 'WO-20260920-018', + contractNo: 'HT-2026-0920-018', + productName: '采集终端 DC-01', + owner: '王芳', + planStart: fmtDate(new Date(planEnd.getTime() + 10 * 86400000)), + planEnd: fmtDate(new Date(planEnd.getTime() + 50 * 86400000)), + remainDays: daysFromToday(new Date(planEnd.getTime() + 50 * 86400000)), + totalQty: 1800, + doneQty: 120, + progress: Math.round((120 / 1800) * 100), + processDone: 2, + processTotal: 12, + currentProcess: '工序 3 · 主板焊接', + status: '生产中', + traceStepCount: 2016, + traceable: true, + steps: progressSteps, + }, + ], traces, trends: { production: trends }, points: buildDemoPoints(), diff --git a/bj_power_dashboard/src/pages/LineModel.css b/bj_power_dashboard/src/pages/LineModel.css index 37aea53..1714860 100644 --- a/bj_power_dashboard/src/pages/LineModel.css +++ b/bj_power_dashboard/src/pages/LineModel.css @@ -113,3 +113,16 @@ 0%, 100% { opacity: 1; } 50% { opacity: 0.35; } } + +/* 虚拟工位滚动栏:两份内容拷贝拼接,translateY 到 -contentH 实现无缝循环 + (--scroll-to 由组件按内容高度内联注入;速度 = 高度/22px 每秒,最低 12s) */ +.linemodel-svg .lm-vscroll-track { + animation-name: lm-vscroll; + animation-timing-function: linear; + animation-iteration-count: infinite; +} + +@keyframes lm-vscroll { + from { transform: translateY(0); } + to { transform: translateY(var(--scroll-to, -200px)); } +} diff --git a/bj_power_dashboard/src/pages/LineModel.tsx b/bj_power_dashboard/src/pages/LineModel.tsx index d4f9920..8ea1dc1 100644 --- a/bj_power_dashboard/src/pages/LineModel.tsx +++ b/bj_power_dashboard/src/pages/LineModel.tsx @@ -1,4 +1,5 @@ import { useEffect, useMemo, useState } from 'react'; +import type { CSSProperties } from 'react'; import type { AgvRobot, DashboardData, LinePoint, Station } from '../types'; import './LineModel.css'; @@ -11,9 +12,13 @@ import './LineModel.css'; // 缓存位 C2C3 / C5C6 / C8C9 / C11C12 / C14 // 接驳台:工位 1~10 各 2 个(L=左 / R=右,共 20 个 AGV 点位)+ 库房接驳台 JBT21 // -// 画布比例 1900×540(≈ 全宽主视觉容器 3.5:1)——横长比例与真实产线一致,SVG 铺满不留黑边。 +// 画布比例 2080×540——横长比例与真实产线一致,SVG 铺满不留黑边。 // 纵向分区:上排接驳台(64~94) / 上排工位(100~204) / 主线带(240~288) / 下排工位(324~428) / 下排接驳台(438~468) -// 横向分区:主线+工位(x 40~1560) / 库房侧 JBT21+AGV+图例(x 1610~1810) +// 横向分区:主线+工位(x 40~1560) / 库房侧 JBT21+AGV+图例(x 1610~1810) / 虚拟工位滚动栏(x 1840~2070) +// +// 展示命名(产品口径,人能看懂):工位卡=工位1~工位12;接驳台=工位N左/工位N右; +// 主线块=停靠位/缓存位(缓存区成组框标注);数据通道 code(C1~C15/G1L..G10R/JBT21)保持不变, +// 仅改显示文本,PLC 点位映射不受影响。 // // 数据:工位状态/SN/操作人/完成数 ← equipment;点位亮灭 ← points(PLC 48 位); // 在途流光 ← points.transit(MW 非 0 的真实路径指令,同一时刻至多一条); @@ -21,7 +26,7 @@ import './LineModel.css'; // 动效:全部 CSS 动画 / transition,无 JS 帧循环(4K 不掉帧) // ============================================================ -const VIEW_W = 1900; +const VIEW_W = 2080; const VIEW_H = 540; // 主线 15 个位置:块宽 76、步长 96(C1 中心 140 → C15 中心 1484) @@ -33,6 +38,14 @@ const cx = (i: number) => 140 + (i - 1) * C_STEP; // 停靠位(不缓存,正对工位对) const STOP_C = [1, 4, 7, 10, 13, 15]; +// 缓存区(非停靠位成组框标注):C2C3 / C5C6 / C8C9 / C11C12 / C14 +const CACHE_GROUPS: number[][] = [ + [2, 3], + [5, 6], + [8, 9], + [11, 12], + [14], +]; // 工位对 → 停靠位 const PAIR_STOP: Array<[number, number, number]> = [ [1, 2, 1], @@ -62,6 +75,13 @@ const JBT_X = WAREHOUSE_X + WAREHOUSE_W / 2; const JBT_Y = 120; const AGV_LANE_Y = 190; +// 虚拟工位滚动栏(库房侧右侧):数量不定,超出可视高度自动无缝滚动 +const VIRT_X = 1840; +const VIRT_W = 230; +const VIRT_Y = 56; +const VIRT_H = 412; +const VIRT_ROW_H = 46; + // ============================================================ // 点位坐标表(流光端点 / AGV 目标定位) // ============================================================ @@ -156,6 +176,11 @@ export function LineModel({ data }: { data: DashboardData }) { const agv1 = data.agv.find((a) => a.code.endsWith('01')); const agv2 = data.agv.find((a) => a.code.endsWith('02')); + const virtuals = data.virtualStations || []; + const virtContentH = virtuals.length * VIRT_ROW_H; + // 内容超过可视高度才滚动(两份拷贝拼接 → translateY(-contentH) 无缝循环) + const virtScroll = virtuals.length > Math.floor((VIRT_H - 60) / VIRT_ROW_H); + return (
@@ -164,7 +189,7 @@ export function LineModel({ data }: { data: DashboardData }) { 在制 {data.production.inLine ?? 0} 件 工位 {inStation} · 主线 {inMain} · 接驳台 {inDock} {data.points.mock && 点位模拟数据} - 上排 1/3/5/7/9 + 末端 11 · 下排 2/4/6/8/10 + 末端 12 + 上排 工位1/3/5/7/9 + 末端11 · 下排 工位2/4/6/8/10 + 末端12
@@ -176,6 +201,9 @@ export function LineModel({ data }: { data: DashboardData }) { + + + {/* 满幅底纹:铺满整个主视觉区,不留"黑洞" */} @@ -213,7 +241,24 @@ export function LineModel({ data }: { data: DashboardData }) { ); })} - {/* ---------- 主线 C1~C15 ---------- */} + {/* ---------- 缓存区分组框(C2C3 / C5C6 / C8C9 / C11C12 / C14) ---------- */} + {CACHE_GROUPS.map((group, gi) => { + const x1 = cx(group[0]) - C_W / 2 - 5; + const x2 = cx(group[group.length - 1]) + C_W / 2 + 5; + return ( + + + + 缓存区 + + + ); + })} + + {/* ---------- 主线 C1~C15(显示命名:停靠位 / 缓存位) ---------- */} {Array.from({ length: 15 }, (_, i) => { const n = i + 1; const isStop = STOP_C.includes(n); @@ -229,7 +274,7 @@ export function LineModel({ data }: { data: DashboardData }) { /> {has && } - C{n} + {isStop ? '停靠位' : '缓存位'} ); @@ -245,10 +290,10 @@ export function LineModel({ data }: { data: DashboardData }) { {!isEnd && ( <> - - - - + + + + )} @@ -265,8 +310,8 @@ export function LineModel({ data }: { data: DashboardData }) { stroke={hasJbt ? COLOR.dockOn : COLOR.dockEdge} strokeWidth="1.4" /> {hasJbt && } - JBT21 - 库房接驳台 + 库房接驳台 + JBT21 @@ -281,13 +326,51 @@ export function LineModel({ data }: { data: DashboardData }) { - + + {/* ---------- 虚拟工位滚动栏(库房侧右侧):不连 PLC 的记录型工位,数量不定 → 超高自动无缝滚动 ---------- */} + + + + 虚拟工位 + + + 不连 PLC · 仅记录{virtScroll ? ' · 自动滚动' : ''} + + {virtuals.length === 0 ? ( + + 暂无虚拟工位 + + ) : ( + + + {[0, 1].map((copy) => + virtuals.map((v, i) => ( + + )), + )} + + + )} + + - 虚线箭头 = 主线自左向右单向流动 · 布局依据:产线布局说明(停靠位 C1/C4/C7/C10/C13/C15;缓存位 C2C3 / C5C6 / C8C9 / C11C12 / C14) + 虚线箭头 = 主线自左向右单向流动 · 停靠位(C1/C4/C7/C10/C13/C15,到位即顶升进工位)· 缓存区(C2C3 / C5C6 / C8C9 / C11C12 / C14,可临时停放)
@@ -314,7 +397,7 @@ function StationBox({ return ( - {end ? `G${no} 下料` : `G${no}`} + {end ? `工位${no} 下料` : `工位${no}`} {paused && ( @@ -365,6 +448,35 @@ function LegendRow({ y, color, label }: { y: number; color: string; label: strin ); } +/** 虚拟工位状态文案 */ +const VIRT_STATUS: Record = { + running: { label: '作业中', color: '#67e8f9' }, + idle: { label: '空闲', color: '#94a3b8' }, + alarm: { label: '报警', color: '#f59e0b' }, + offline: { label: '离线', color: '#64748b' }, +}; + +/** 虚拟工位行卡(滚动栏内):名称+状态+今日完成 / 在制 SN 或最近工序 */ +function VirtualRow({ x, y, w, station }: { x: number; y: number; w: number; station: Station }) { + const st = VIRT_STATUS[station.status] || VIRT_STATUS.idle; + const info = station.currentSn + ? `SN ${station.currentSn}` + : station.currentProcess + ? station.currentProcess + : '无在制工件'; + return ( + + + + {station.name || `虚拟工位${station.id}`} + {st.label} + {station.doneCount ? 今日完成 {station.doneCount} : null} + + {info} + + ); +} + /** * AGV 小车:真实备料任务驱动。 * 无任务 → 待命区;loading → 停起点;moving → CSS transition 平滑滑向目标;到位 → 停目标。 diff --git a/bj_power_dashboard/src/pages/ProductionBoard.tsx b/bj_power_dashboard/src/pages/ProductionBoard.tsx index 182b959..6dfd0f8 100644 --- a/bj_power_dashboard/src/pages/ProductionBoard.tsx +++ b/bj_power_dashboard/src/pages/ProductionBoard.tsx @@ -1,5 +1,6 @@ +import { useEffect, useMemo, useState } from 'react'; import type { EChartsOption } from 'echarts'; -import type { DashboardData } from '../types'; +import type { DashboardData, ProductionProgress } from '../types'; import { EChart } from '../components/EChart'; import { dash0 } from './WarehouseBoard'; @@ -11,9 +12,79 @@ const C = { dim: '#64748b', }; -/** 底部左块 · 当前订单(合同/工期/完成度)+ 近 7 日产量趋势 */ +/** 轮播间隔(毫秒):多订单时逐单展示 */ +const ROTATE_MS = 10000; + +/** 单张订单卡(左块):合同/工期/完成度 */ +function OrderCard({ order }: { order: ProductionProgress }) { + return ( +
+
+ {order.contractNo || order.orderNo || '暂无在产订单'} +
+ +
+ {order.productName || '—'} +
+ +
+ + 交期 {order.planEnd || '—'} + + = 0 ? C.green : '#fbbf24' }}> + 剩余 {order.planEnd ? Math.max(order.remainDays, 0) : '—'} 天 + +
+ +
+
+ 完成进度 + + {dash0(order.doneQty)} + / {dash0(order.totalQty)} 台 + +
+
+
+
+
+ 工序 {dash0(order.processDone)}/{dash0(order.processTotal)} + {order.currentProcess ? ` · 当前 ${order.currentProcess}` : ''} +
+
+
+ ); +} + +/** 底部左块 · 当前订单(多订单自动轮播)+ 近 7 日产量趋势 */ export function ProductionBoard({ data }: { data: DashboardData }) { - const { progress, trends } = data; + const { trends } = data; + + // 多订单轮播:progressList 优先(后端下发,进行中排前),未升级时退回单条 progress + const orders = useMemo(() => { + const list = (data.progressList || []).filter((o) => o && (o.orderNo || o.contractNo)); + if (list.length > 0) return list; + return data.progress ? [data.progress] : []; + }, [data.progressList, data.progress]); + + const [idx, setIdx] = useState(0); + useEffect(() => { + setIdx(0); + }, [orders.length]); + useEffect(() => { + if (orders.length <= 1) return; + const t = setInterval(() => setIdx((i) => (i + 1) % orders.length), ROTATE_MS); + return () => clearInterval(t); + }, [orders.length]); + + const current = orders[Math.min(idx, orders.length - 1)]; const trendOption: EChartsOption = { grid: { left: 8, right: 12, top: 14, bottom: 4, containLabel: true }, @@ -50,51 +121,15 @@ export function ProductionBoard({ data }: { data: DashboardData }) {
当前订单 合同 · 工期 · 完成度 + {orders.length > 1 && ( + + {idx + 1}/{orders.length} + + )}
- {/* 左:订单信息 */} -
-
- {progress.contractNo || progress.orderNo || '暂无在产订单'} -
- -
- {progress.productName || '—'} -
- -
- - 交期 {progress.planEnd || '—'} - - = 0 ? C.green : '#fbbf24' }}> - 剩余 {progress.planEnd ? Math.max(progress.remainDays, 0) : '—'} 天 - -
- -
-
- 完成进度 - - {dash0(progress.doneQty)} - / {dash0(progress.totalQty)} 台 - -
-
-
-
-
- 工序 {dash0(progress.processDone)}/{dash0(progress.processTotal)} - {progress.currentProcess ? ` · 当前 ${progress.currentProcess}` : ''} -
-
-
+ {/* 左:订单信息(多订单轮播,无鼠标大屏 10s 自动切换) */} + {current && } {/* 右:近 7 日产量趋势(height:100% 跟随容器) */}
diff --git a/bj_power_dashboard/src/types.ts b/bj_power_dashboard/src/types.ts index e5ab30d..63b2110 100644 --- a/bj_power_dashboard/src/types.ts +++ b/bj_power_dashboard/src/types.ts @@ -247,7 +247,11 @@ export interface DashboardData { production: ProductionOverview; warehouse: WarehouseOverview; equipment: Station[]; + /** 虚拟工位(OFFLINE,不连PLC):产线动态地图"虚拟工位"滚动栏展示;后端未升级时为空 */ + virtualStations?: Station[]; progress: ProductionProgress; + /** 当前在产订单列表(多订单轮播):进行中排前,最多 6 条,首条与 progress 一致;后端未升级时为空 */ + progressList?: ProductionProgress[]; /** 追溯轮播数据(最近完工工件) */ traces: TraceItem[]; trends: TrendData; diff --git a/bj_power_mes/ent/attachment.go b/bj_power_mes/ent/attachment.go index 08cc877..0adc460 100644 --- a/bj_power_mes/ent/attachment.go +++ b/bj_power_mes/ent/attachment.go @@ -48,7 +48,13 @@ type Attachment struct { // 删除时间(unix秒) DeletedAt int64 `json:"deletedAt,omitempty"` // 删除人 - DeletedBy string `json:"deletedBy,omitempty"` + DeletedBy string `json:"deletedBy,omitempty"` + // 删除说明(删除弹窗填写,警示留痕) + DeletedReason string `json:"deletedReason,omitempty"` + // 彻底清除时间(unix秒,仅删文件留索引) + PurgedAt int64 `json:"purgedAt,omitempty"` + // 彻底清除操作人 + PurgedBy string `json:"purgedBy,omitempty"` selectValues sql.SelectValues } @@ -59,9 +65,9 @@ func (*Attachment) scanValues(columns []string) ([]any, error) { switch columns[i] { case attachment.FieldArchived, attachment.FieldDeleted: values[i] = new(sql.NullBool) - case attachment.FieldID, attachment.FieldFileSize, attachment.FieldArchivedAt, attachment.FieldDeletedAt: + case attachment.FieldID, attachment.FieldFileSize, attachment.FieldArchivedAt, attachment.FieldDeletedAt, attachment.FieldPurgedAt: values[i] = new(sql.NullInt64) - case attachment.FieldBizType, attachment.FieldBizId, attachment.FieldFileName, attachment.FieldFilePath, attachment.FieldUploader, attachment.FieldFileType, attachment.FieldFileExt, attachment.FieldFileMd5, attachment.FieldMimeType, attachment.FieldDeletedBy: + case attachment.FieldBizType, attachment.FieldBizId, attachment.FieldFileName, attachment.FieldFilePath, attachment.FieldUploader, attachment.FieldFileType, attachment.FieldFileExt, attachment.FieldFileMd5, attachment.FieldMimeType, attachment.FieldDeletedBy, attachment.FieldDeletedReason, attachment.FieldPurgedBy: values[i] = new(sql.NullString) case attachment.FieldCreatedAt: values[i] = new(sql.NullTime) @@ -182,6 +188,24 @@ func (_m *Attachment) assignValues(columns []string, values []any) error { } else if value.Valid { _m.DeletedBy = value.String } + case attachment.FieldDeletedReason: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field deletedReason", values[i]) + } else if value.Valid { + _m.DeletedReason = value.String + } + case attachment.FieldPurgedAt: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field purgedAt", values[i]) + } else if value.Valid { + _m.PurgedAt = value.Int64 + } + case attachment.FieldPurgedBy: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field purgedBy", values[i]) + } else if value.Valid { + _m.PurgedBy = value.String + } default: _m.selectValues.Set(columns[i], values[i]) } @@ -265,6 +289,15 @@ func (_m *Attachment) String() string { builder.WriteString(", ") builder.WriteString("deletedBy=") builder.WriteString(_m.DeletedBy) + builder.WriteString(", ") + builder.WriteString("deletedReason=") + builder.WriteString(_m.DeletedReason) + builder.WriteString(", ") + builder.WriteString("purgedAt=") + builder.WriteString(fmt.Sprintf("%v", _m.PurgedAt)) + builder.WriteString(", ") + builder.WriteString("purgedBy=") + builder.WriteString(_m.PurgedBy) builder.WriteByte(')') return builder.String() } diff --git a/bj_power_mes/ent/attachment/attachment.go b/bj_power_mes/ent/attachment/attachment.go index dd7c713..3731758 100644 --- a/bj_power_mes/ent/attachment/attachment.go +++ b/bj_power_mes/ent/attachment/attachment.go @@ -45,6 +45,12 @@ const ( FieldDeletedAt = "deleted_at" // FieldDeletedBy holds the string denoting the deletedby field in the database. FieldDeletedBy = "deleted_by" + // FieldDeletedReason holds the string denoting the deletedreason field in the database. + FieldDeletedReason = "deleted_reason" + // FieldPurgedAt holds the string denoting the purgedat field in the database. + FieldPurgedAt = "purged_at" + // FieldPurgedBy holds the string denoting the purgedby field in the database. + FieldPurgedBy = "purged_by" // Table holds the table name of the attachment in the database. Table = "attachment" ) @@ -68,6 +74,9 @@ var Columns = []string{ FieldDeleted, FieldDeletedAt, FieldDeletedBy, + FieldDeletedReason, + FieldPurgedAt, + FieldPurgedBy, } // ValidColumn reports if the column name is valid (part of the table columns). @@ -125,6 +134,16 @@ var ( DefaultDeletedBy string // DeletedByValidator is a validator for the "deletedBy" field. It is called by the builders before save. DeletedByValidator func(string) error + // DefaultDeletedReason holds the default value on creation for the "deletedReason" field. + DefaultDeletedReason string + // DeletedReasonValidator is a validator for the "deletedReason" field. It is called by the builders before save. + DeletedReasonValidator func(string) error + // DefaultPurgedAt holds the default value on creation for the "purgedAt" field. + DefaultPurgedAt int64 + // DefaultPurgedBy holds the default value on creation for the "purgedBy" field. + DefaultPurgedBy string + // PurgedByValidator is a validator for the "purgedBy" field. It is called by the builders before save. + PurgedByValidator func(string) error // IDValidator is a validator for the "id" field. It is called by the builders before save. IDValidator func(int) error ) @@ -216,3 +235,18 @@ func ByDeletedAt(opts ...sql.OrderTermOption) OrderOption { func ByDeletedBy(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldDeletedBy, opts...).ToFunc() } + +// ByDeletedReason orders the results by the deletedReason field. +func ByDeletedReason(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldDeletedReason, opts...).ToFunc() +} + +// ByPurgedAt orders the results by the purgedAt field. +func ByPurgedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldPurgedAt, opts...).ToFunc() +} + +// ByPurgedBy orders the results by the purgedBy field. +func ByPurgedBy(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldPurgedBy, opts...).ToFunc() +} diff --git a/bj_power_mes/ent/attachment/where.go b/bj_power_mes/ent/attachment/where.go index a14150c..73e450b 100644 --- a/bj_power_mes/ent/attachment/where.go +++ b/bj_power_mes/ent/attachment/where.go @@ -134,6 +134,21 @@ func DeletedBy(v string) predicate.Attachment { return predicate.Attachment(sql.FieldEQ(FieldDeletedBy, v)) } +// DeletedReason applies equality check predicate on the "deletedReason" field. It's identical to DeletedReasonEQ. +func DeletedReason(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldEQ(FieldDeletedReason, v)) +} + +// PurgedAt applies equality check predicate on the "purgedAt" field. It's identical to PurgedAtEQ. +func PurgedAt(v int64) predicate.Attachment { + return predicate.Attachment(sql.FieldEQ(FieldPurgedAt, v)) +} + +// PurgedBy applies equality check predicate on the "purgedBy" field. It's identical to PurgedByEQ. +func PurgedBy(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldEQ(FieldPurgedBy, v)) +} + // BizTypeEQ applies the EQ predicate on the "bizType" field. func BizTypeEQ(v string) predicate.Attachment { return predicate.Attachment(sql.FieldEQ(FieldBizType, v)) @@ -964,6 +979,176 @@ func DeletedByContainsFold(v string) predicate.Attachment { return predicate.Attachment(sql.FieldContainsFold(FieldDeletedBy, v)) } +// DeletedReasonEQ applies the EQ predicate on the "deletedReason" field. +func DeletedReasonEQ(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldEQ(FieldDeletedReason, v)) +} + +// DeletedReasonNEQ applies the NEQ predicate on the "deletedReason" field. +func DeletedReasonNEQ(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldNEQ(FieldDeletedReason, v)) +} + +// DeletedReasonIn applies the In predicate on the "deletedReason" field. +func DeletedReasonIn(vs ...string) predicate.Attachment { + return predicate.Attachment(sql.FieldIn(FieldDeletedReason, vs...)) +} + +// DeletedReasonNotIn applies the NotIn predicate on the "deletedReason" field. +func DeletedReasonNotIn(vs ...string) predicate.Attachment { + return predicate.Attachment(sql.FieldNotIn(FieldDeletedReason, vs...)) +} + +// DeletedReasonGT applies the GT predicate on the "deletedReason" field. +func DeletedReasonGT(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldGT(FieldDeletedReason, v)) +} + +// DeletedReasonGTE applies the GTE predicate on the "deletedReason" field. +func DeletedReasonGTE(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldGTE(FieldDeletedReason, v)) +} + +// DeletedReasonLT applies the LT predicate on the "deletedReason" field. +func DeletedReasonLT(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldLT(FieldDeletedReason, v)) +} + +// DeletedReasonLTE applies the LTE predicate on the "deletedReason" field. +func DeletedReasonLTE(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldLTE(FieldDeletedReason, v)) +} + +// DeletedReasonContains applies the Contains predicate on the "deletedReason" field. +func DeletedReasonContains(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldContains(FieldDeletedReason, v)) +} + +// DeletedReasonHasPrefix applies the HasPrefix predicate on the "deletedReason" field. +func DeletedReasonHasPrefix(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldHasPrefix(FieldDeletedReason, v)) +} + +// DeletedReasonHasSuffix applies the HasSuffix predicate on the "deletedReason" field. +func DeletedReasonHasSuffix(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldHasSuffix(FieldDeletedReason, v)) +} + +// DeletedReasonEqualFold applies the EqualFold predicate on the "deletedReason" field. +func DeletedReasonEqualFold(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldEqualFold(FieldDeletedReason, v)) +} + +// DeletedReasonContainsFold applies the ContainsFold predicate on the "deletedReason" field. +func DeletedReasonContainsFold(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldContainsFold(FieldDeletedReason, v)) +} + +// PurgedAtEQ applies the EQ predicate on the "purgedAt" field. +func PurgedAtEQ(v int64) predicate.Attachment { + return predicate.Attachment(sql.FieldEQ(FieldPurgedAt, v)) +} + +// PurgedAtNEQ applies the NEQ predicate on the "purgedAt" field. +func PurgedAtNEQ(v int64) predicate.Attachment { + return predicate.Attachment(sql.FieldNEQ(FieldPurgedAt, v)) +} + +// PurgedAtIn applies the In predicate on the "purgedAt" field. +func PurgedAtIn(vs ...int64) predicate.Attachment { + return predicate.Attachment(sql.FieldIn(FieldPurgedAt, vs...)) +} + +// PurgedAtNotIn applies the NotIn predicate on the "purgedAt" field. +func PurgedAtNotIn(vs ...int64) predicate.Attachment { + return predicate.Attachment(sql.FieldNotIn(FieldPurgedAt, vs...)) +} + +// PurgedAtGT applies the GT predicate on the "purgedAt" field. +func PurgedAtGT(v int64) predicate.Attachment { + return predicate.Attachment(sql.FieldGT(FieldPurgedAt, v)) +} + +// PurgedAtGTE applies the GTE predicate on the "purgedAt" field. +func PurgedAtGTE(v int64) predicate.Attachment { + return predicate.Attachment(sql.FieldGTE(FieldPurgedAt, v)) +} + +// PurgedAtLT applies the LT predicate on the "purgedAt" field. +func PurgedAtLT(v int64) predicate.Attachment { + return predicate.Attachment(sql.FieldLT(FieldPurgedAt, v)) +} + +// PurgedAtLTE applies the LTE predicate on the "purgedAt" field. +func PurgedAtLTE(v int64) predicate.Attachment { + return predicate.Attachment(sql.FieldLTE(FieldPurgedAt, v)) +} + +// PurgedByEQ applies the EQ predicate on the "purgedBy" field. +func PurgedByEQ(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldEQ(FieldPurgedBy, v)) +} + +// PurgedByNEQ applies the NEQ predicate on the "purgedBy" field. +func PurgedByNEQ(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldNEQ(FieldPurgedBy, v)) +} + +// PurgedByIn applies the In predicate on the "purgedBy" field. +func PurgedByIn(vs ...string) predicate.Attachment { + return predicate.Attachment(sql.FieldIn(FieldPurgedBy, vs...)) +} + +// PurgedByNotIn applies the NotIn predicate on the "purgedBy" field. +func PurgedByNotIn(vs ...string) predicate.Attachment { + return predicate.Attachment(sql.FieldNotIn(FieldPurgedBy, vs...)) +} + +// PurgedByGT applies the GT predicate on the "purgedBy" field. +func PurgedByGT(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldGT(FieldPurgedBy, v)) +} + +// PurgedByGTE applies the GTE predicate on the "purgedBy" field. +func PurgedByGTE(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldGTE(FieldPurgedBy, v)) +} + +// PurgedByLT applies the LT predicate on the "purgedBy" field. +func PurgedByLT(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldLT(FieldPurgedBy, v)) +} + +// PurgedByLTE applies the LTE predicate on the "purgedBy" field. +func PurgedByLTE(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldLTE(FieldPurgedBy, v)) +} + +// PurgedByContains applies the Contains predicate on the "purgedBy" field. +func PurgedByContains(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldContains(FieldPurgedBy, v)) +} + +// PurgedByHasPrefix applies the HasPrefix predicate on the "purgedBy" field. +func PurgedByHasPrefix(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldHasPrefix(FieldPurgedBy, v)) +} + +// PurgedByHasSuffix applies the HasSuffix predicate on the "purgedBy" field. +func PurgedByHasSuffix(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldHasSuffix(FieldPurgedBy, v)) +} + +// PurgedByEqualFold applies the EqualFold predicate on the "purgedBy" field. +func PurgedByEqualFold(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldEqualFold(FieldPurgedBy, v)) +} + +// PurgedByContainsFold applies the ContainsFold predicate on the "purgedBy" field. +func PurgedByContainsFold(v string) predicate.Attachment { + return predicate.Attachment(sql.FieldContainsFold(FieldPurgedBy, v)) +} + // And groups predicates with the AND operator between them. func And(predicates ...predicate.Attachment) predicate.Attachment { return predicate.Attachment(sql.AndPredicates(predicates...)) diff --git a/bj_power_mes/ent/attachment_create.go b/bj_power_mes/ent/attachment_create.go index ce07d77..cc96d14 100644 --- a/bj_power_mes/ent/attachment_create.go +++ b/bj_power_mes/ent/attachment_create.go @@ -212,6 +212,48 @@ func (_c *AttachmentCreate) SetNillableDeletedBy(v *string) *AttachmentCreate { return _c } +// SetDeletedReason sets the "deletedReason" field. +func (_c *AttachmentCreate) SetDeletedReason(v string) *AttachmentCreate { + _c.mutation.SetDeletedReason(v) + return _c +} + +// SetNillableDeletedReason sets the "deletedReason" field if the given value is not nil. +func (_c *AttachmentCreate) SetNillableDeletedReason(v *string) *AttachmentCreate { + if v != nil { + _c.SetDeletedReason(*v) + } + return _c +} + +// SetPurgedAt sets the "purgedAt" field. +func (_c *AttachmentCreate) SetPurgedAt(v int64) *AttachmentCreate { + _c.mutation.SetPurgedAt(v) + return _c +} + +// SetNillablePurgedAt sets the "purgedAt" field if the given value is not nil. +func (_c *AttachmentCreate) SetNillablePurgedAt(v *int64) *AttachmentCreate { + if v != nil { + _c.SetPurgedAt(*v) + } + return _c +} + +// SetPurgedBy sets the "purgedBy" field. +func (_c *AttachmentCreate) SetPurgedBy(v string) *AttachmentCreate { + _c.mutation.SetPurgedBy(v) + return _c +} + +// SetNillablePurgedBy sets the "purgedBy" field if the given value is not nil. +func (_c *AttachmentCreate) SetNillablePurgedBy(v *string) *AttachmentCreate { + if v != nil { + _c.SetPurgedBy(*v) + } + return _c +} + // SetID sets the "id" field. func (_c *AttachmentCreate) SetID(v int) *AttachmentCreate { _c.mutation.SetID(v) @@ -301,6 +343,18 @@ func (_c *AttachmentCreate) defaults() { v := attachment.DefaultDeletedBy _c.mutation.SetDeletedBy(v) } + if _, ok := _c.mutation.DeletedReason(); !ok { + v := attachment.DefaultDeletedReason + _c.mutation.SetDeletedReason(v) + } + if _, ok := _c.mutation.PurgedAt(); !ok { + v := attachment.DefaultPurgedAt + _c.mutation.SetPurgedAt(v) + } + if _, ok := _c.mutation.PurgedBy(); !ok { + v := attachment.DefaultPurgedBy + _c.mutation.SetPurgedBy(v) + } } // check runs all checks and user-defined validators on the builder. @@ -403,6 +457,25 @@ func (_c *AttachmentCreate) check() error { return &ValidationError{Name: "deletedBy", err: fmt.Errorf(`ent: validator failed for field "Attachment.deletedBy": %w`, err)} } } + if _, ok := _c.mutation.DeletedReason(); !ok { + return &ValidationError{Name: "deletedReason", err: errors.New(`ent: missing required field "Attachment.deletedReason"`)} + } + if v, ok := _c.mutation.DeletedReason(); ok { + if err := attachment.DeletedReasonValidator(v); err != nil { + return &ValidationError{Name: "deletedReason", err: fmt.Errorf(`ent: validator failed for field "Attachment.deletedReason": %w`, err)} + } + } + if _, ok := _c.mutation.PurgedAt(); !ok { + return &ValidationError{Name: "purgedAt", err: errors.New(`ent: missing required field "Attachment.purgedAt"`)} + } + if _, ok := _c.mutation.PurgedBy(); !ok { + return &ValidationError{Name: "purgedBy", err: errors.New(`ent: missing required field "Attachment.purgedBy"`)} + } + if v, ok := _c.mutation.PurgedBy(); ok { + if err := attachment.PurgedByValidator(v); err != nil { + return &ValidationError{Name: "purgedBy", err: fmt.Errorf(`ent: validator failed for field "Attachment.purgedBy": %w`, err)} + } + } if v, ok := _c.mutation.ID(); ok { if err := attachment.IDValidator(v); err != nil { return &ValidationError{Name: "id", err: fmt.Errorf(`ent: validator failed for field "Attachment.id": %w`, err)} @@ -504,6 +577,18 @@ func (_c *AttachmentCreate) createSpec() (*Attachment, *sqlgraph.CreateSpec) { _spec.SetField(attachment.FieldDeletedBy, field.TypeString, value) _node.DeletedBy = value } + if value, ok := _c.mutation.DeletedReason(); ok { + _spec.SetField(attachment.FieldDeletedReason, field.TypeString, value) + _node.DeletedReason = value + } + if value, ok := _c.mutation.PurgedAt(); ok { + _spec.SetField(attachment.FieldPurgedAt, field.TypeInt64, value) + _node.PurgedAt = value + } + if value, ok := _c.mutation.PurgedBy(); ok { + _spec.SetField(attachment.FieldPurgedBy, field.TypeString, value) + _node.PurgedBy = value + } return _node, _spec } diff --git a/bj_power_mes/ent/attachment_update.go b/bj_power_mes/ent/attachment_update.go index 13fffa1..472a054 100644 --- a/bj_power_mes/ent/attachment_update.go +++ b/bj_power_mes/ent/attachment_update.go @@ -259,6 +259,55 @@ func (_u *AttachmentUpdate) SetNillableDeletedBy(v *string) *AttachmentUpdate { return _u } +// SetDeletedReason sets the "deletedReason" field. +func (_u *AttachmentUpdate) SetDeletedReason(v string) *AttachmentUpdate { + _u.mutation.SetDeletedReason(v) + return _u +} + +// SetNillableDeletedReason sets the "deletedReason" field if the given value is not nil. +func (_u *AttachmentUpdate) SetNillableDeletedReason(v *string) *AttachmentUpdate { + if v != nil { + _u.SetDeletedReason(*v) + } + return _u +} + +// SetPurgedAt sets the "purgedAt" field. +func (_u *AttachmentUpdate) SetPurgedAt(v int64) *AttachmentUpdate { + _u.mutation.ResetPurgedAt() + _u.mutation.SetPurgedAt(v) + return _u +} + +// SetNillablePurgedAt sets the "purgedAt" field if the given value is not nil. +func (_u *AttachmentUpdate) SetNillablePurgedAt(v *int64) *AttachmentUpdate { + if v != nil { + _u.SetPurgedAt(*v) + } + return _u +} + +// AddPurgedAt adds value to the "purgedAt" field. +func (_u *AttachmentUpdate) AddPurgedAt(v int64) *AttachmentUpdate { + _u.mutation.AddPurgedAt(v) + return _u +} + +// SetPurgedBy sets the "purgedBy" field. +func (_u *AttachmentUpdate) SetPurgedBy(v string) *AttachmentUpdate { + _u.mutation.SetPurgedBy(v) + return _u +} + +// SetNillablePurgedBy sets the "purgedBy" field if the given value is not nil. +func (_u *AttachmentUpdate) SetNillablePurgedBy(v *string) *AttachmentUpdate { + if v != nil { + _u.SetPurgedBy(*v) + } + return _u +} + // Mutation returns the AttachmentMutation object of the builder. func (_u *AttachmentUpdate) Mutation() *AttachmentMutation { return _u.mutation @@ -343,6 +392,16 @@ func (_u *AttachmentUpdate) check() error { return &ValidationError{Name: "deletedBy", err: fmt.Errorf(`ent: validator failed for field "Attachment.deletedBy": %w`, err)} } } + if v, ok := _u.mutation.DeletedReason(); ok { + if err := attachment.DeletedReasonValidator(v); err != nil { + return &ValidationError{Name: "deletedReason", err: fmt.Errorf(`ent: validator failed for field "Attachment.deletedReason": %w`, err)} + } + } + if v, ok := _u.mutation.PurgedBy(); ok { + if err := attachment.PurgedByValidator(v); err != nil { + return &ValidationError{Name: "purgedBy", err: fmt.Errorf(`ent: validator failed for field "Attachment.purgedBy": %w`, err)} + } + } return nil } @@ -418,6 +477,18 @@ func (_u *AttachmentUpdate) sqlSave(ctx context.Context) (_node int, err error) if value, ok := _u.mutation.DeletedBy(); ok { _spec.SetField(attachment.FieldDeletedBy, field.TypeString, value) } + if value, ok := _u.mutation.DeletedReason(); ok { + _spec.SetField(attachment.FieldDeletedReason, field.TypeString, value) + } + if value, ok := _u.mutation.PurgedAt(); ok { + _spec.SetField(attachment.FieldPurgedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedPurgedAt(); ok { + _spec.AddField(attachment.FieldPurgedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.PurgedBy(); ok { + _spec.SetField(attachment.FieldPurgedBy, field.TypeString, value) + } _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { if _, ok := err.(*sqlgraph.NotFoundError); ok { @@ -671,6 +742,55 @@ func (_u *AttachmentUpdateOne) SetNillableDeletedBy(v *string) *AttachmentUpdate return _u } +// SetDeletedReason sets the "deletedReason" field. +func (_u *AttachmentUpdateOne) SetDeletedReason(v string) *AttachmentUpdateOne { + _u.mutation.SetDeletedReason(v) + return _u +} + +// SetNillableDeletedReason sets the "deletedReason" field if the given value is not nil. +func (_u *AttachmentUpdateOne) SetNillableDeletedReason(v *string) *AttachmentUpdateOne { + if v != nil { + _u.SetDeletedReason(*v) + } + return _u +} + +// SetPurgedAt sets the "purgedAt" field. +func (_u *AttachmentUpdateOne) SetPurgedAt(v int64) *AttachmentUpdateOne { + _u.mutation.ResetPurgedAt() + _u.mutation.SetPurgedAt(v) + return _u +} + +// SetNillablePurgedAt sets the "purgedAt" field if the given value is not nil. +func (_u *AttachmentUpdateOne) SetNillablePurgedAt(v *int64) *AttachmentUpdateOne { + if v != nil { + _u.SetPurgedAt(*v) + } + return _u +} + +// AddPurgedAt adds value to the "purgedAt" field. +func (_u *AttachmentUpdateOne) AddPurgedAt(v int64) *AttachmentUpdateOne { + _u.mutation.AddPurgedAt(v) + return _u +} + +// SetPurgedBy sets the "purgedBy" field. +func (_u *AttachmentUpdateOne) SetPurgedBy(v string) *AttachmentUpdateOne { + _u.mutation.SetPurgedBy(v) + return _u +} + +// SetNillablePurgedBy sets the "purgedBy" field if the given value is not nil. +func (_u *AttachmentUpdateOne) SetNillablePurgedBy(v *string) *AttachmentUpdateOne { + if v != nil { + _u.SetPurgedBy(*v) + } + return _u +} + // Mutation returns the AttachmentMutation object of the builder. func (_u *AttachmentUpdateOne) Mutation() *AttachmentMutation { return _u.mutation @@ -768,6 +888,16 @@ func (_u *AttachmentUpdateOne) check() error { return &ValidationError{Name: "deletedBy", err: fmt.Errorf(`ent: validator failed for field "Attachment.deletedBy": %w`, err)} } } + if v, ok := _u.mutation.DeletedReason(); ok { + if err := attachment.DeletedReasonValidator(v); err != nil { + return &ValidationError{Name: "deletedReason", err: fmt.Errorf(`ent: validator failed for field "Attachment.deletedReason": %w`, err)} + } + } + if v, ok := _u.mutation.PurgedBy(); ok { + if err := attachment.PurgedByValidator(v); err != nil { + return &ValidationError{Name: "purgedBy", err: fmt.Errorf(`ent: validator failed for field "Attachment.purgedBy": %w`, err)} + } + } return nil } @@ -860,6 +990,18 @@ func (_u *AttachmentUpdateOne) sqlSave(ctx context.Context) (_node *Attachment, if value, ok := _u.mutation.DeletedBy(); ok { _spec.SetField(attachment.FieldDeletedBy, field.TypeString, value) } + if value, ok := _u.mutation.DeletedReason(); ok { + _spec.SetField(attachment.FieldDeletedReason, field.TypeString, value) + } + if value, ok := _u.mutation.PurgedAt(); ok { + _spec.SetField(attachment.FieldPurgedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedPurgedAt(); ok { + _spec.AddField(attachment.FieldPurgedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.PurgedBy(); ok { + _spec.SetField(attachment.FieldPurgedBy, field.TypeString, value) + } _spec.AddModifiers(_u.modifiers...) _node = &Attachment{config: _u.config} _spec.Assign = _node.assignValues diff --git a/bj_power_mes/ent/backuprecord.go b/bj_power_mes/ent/backuprecord.go index 9b6252b..84de7fe 100644 --- a/bj_power_mes/ent/backuprecord.go +++ b/bj_power_mes/ent/backuprecord.go @@ -28,14 +28,18 @@ type BackupRecord struct { TotalSize int64 `json:"totalSize,omitempty"` // 各数据项及大小(JSON数组:[{name,rows,bytes}]) ItemsJSON string `json:"itemsJSON,omitempty"` - // success/failed/partial + // success/failed/partial/cleanup/cleanup_forced Status string `json:"status,omitempty"` // 操作人 Operator string `json:"operator,omitempty"` // 备份包校验和(sha256,基于 manifest) Checksum string `json:"checksum,omitempty"` // 写入方 mes/wms - Scope string `json:"scope,omitempty"` + Scope string `json:"scope,omitempty"` + // 强制清理时填写姓名(警示留痕,非强制清理为空) + AckName string `json:"ackName,omitempty"` + // 强制清理时填写手机号(警示留痕,非强制清理为空) + AckPhone string `json:"ackPhone,omitempty"` selectValues sql.SelectValues } @@ -46,7 +50,7 @@ func (*BackupRecord) scanValues(columns []string) ([]any, error) { switch columns[i] { case backuprecord.FieldID, backuprecord.FieldExecutedAt, backuprecord.FieldRangeStart, backuprecord.FieldRangeEnd, backuprecord.FieldTotalSize: values[i] = new(sql.NullInt64) - case backuprecord.FieldBackupPath, backuprecord.FieldItemsJSON, backuprecord.FieldStatus, backuprecord.FieldOperator, backuprecord.FieldChecksum, backuprecord.FieldScope: + case backuprecord.FieldBackupPath, backuprecord.FieldItemsJSON, backuprecord.FieldStatus, backuprecord.FieldOperator, backuprecord.FieldChecksum, backuprecord.FieldScope, backuprecord.FieldAckName, backuprecord.FieldAckPhone: values[i] = new(sql.NullString) default: values[i] = new(sql.UnknownType) @@ -129,6 +133,18 @@ func (_m *BackupRecord) assignValues(columns []string, values []any) error { } else if value.Valid { _m.Scope = value.String } + case backuprecord.FieldAckName: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field ackName", values[i]) + } else if value.Valid { + _m.AckName = value.String + } + case backuprecord.FieldAckPhone: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field ackPhone", values[i]) + } else if value.Valid { + _m.AckPhone = value.String + } default: _m.selectValues.Set(columns[i], values[i]) } @@ -194,6 +210,12 @@ func (_m *BackupRecord) String() string { builder.WriteString(", ") builder.WriteString("scope=") builder.WriteString(_m.Scope) + builder.WriteString(", ") + builder.WriteString("ackName=") + builder.WriteString(_m.AckName) + builder.WriteString(", ") + builder.WriteString("ackPhone=") + builder.WriteString(_m.AckPhone) builder.WriteByte(')') return builder.String() } diff --git a/bj_power_mes/ent/backuprecord/backuprecord.go b/bj_power_mes/ent/backuprecord/backuprecord.go index 7a4c7f2..86b9e9c 100644 --- a/bj_power_mes/ent/backuprecord/backuprecord.go +++ b/bj_power_mes/ent/backuprecord/backuprecord.go @@ -31,6 +31,10 @@ const ( FieldChecksum = "checksum" // FieldScope holds the string denoting the scope field in the database. FieldScope = "scope" + // FieldAckName holds the string denoting the ackname field in the database. + FieldAckName = "ack_name" + // FieldAckPhone holds the string denoting the ackphone field in the database. + FieldAckPhone = "ack_phone" // Table holds the table name of the backuprecord in the database. Table = "backup_record" ) @@ -48,6 +52,8 @@ var Columns = []string{ FieldOperator, FieldChecksum, FieldScope, + FieldAckName, + FieldAckPhone, } // ValidColumn reports if the column name is valid (part of the table columns). @@ -81,6 +87,14 @@ var ( DefaultScope string // ScopeValidator is a validator for the "scope" field. It is called by the builders before save. ScopeValidator func(string) error + // DefaultAckName holds the default value on creation for the "ackName" field. + DefaultAckName string + // AckNameValidator is a validator for the "ackName" field. It is called by the builders before save. + AckNameValidator func(string) error + // DefaultAckPhone holds the default value on creation for the "ackPhone" field. + DefaultAckPhone string + // AckPhoneValidator is a validator for the "ackPhone" field. It is called by the builders before save. + AckPhoneValidator func(string) error // IDValidator is a validator for the "id" field. It is called by the builders before save. IDValidator func(int) error ) @@ -142,3 +156,13 @@ func ByChecksum(opts ...sql.OrderTermOption) OrderOption { func ByScope(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldScope, opts...).ToFunc() } + +// ByAckName orders the results by the ackName field. +func ByAckName(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldAckName, opts...).ToFunc() +} + +// ByAckPhone orders the results by the ackPhone field. +func ByAckPhone(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldAckPhone, opts...).ToFunc() +} diff --git a/bj_power_mes/ent/backuprecord/where.go b/bj_power_mes/ent/backuprecord/where.go index 989194c..c7b155f 100644 --- a/bj_power_mes/ent/backuprecord/where.go +++ b/bj_power_mes/ent/backuprecord/where.go @@ -103,6 +103,16 @@ func Scope(v string) predicate.BackupRecord { return predicate.BackupRecord(sql.FieldEQ(FieldScope, v)) } +// AckName applies equality check predicate on the "ackName" field. It's identical to AckNameEQ. +func AckName(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldEQ(FieldAckName, v)) +} + +// AckPhone applies equality check predicate on the "ackPhone" field. It's identical to AckPhoneEQ. +func AckPhone(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldEQ(FieldAckPhone, v)) +} + // ExecutedAtEQ applies the EQ predicate on the "executedAt" field. func ExecutedAtEQ(v int64) predicate.BackupRecord { return predicate.BackupRecord(sql.FieldEQ(FieldExecutedAt, v)) @@ -653,6 +663,136 @@ func ScopeContainsFold(v string) predicate.BackupRecord { return predicate.BackupRecord(sql.FieldContainsFold(FieldScope, v)) } +// AckNameEQ applies the EQ predicate on the "ackName" field. +func AckNameEQ(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldEQ(FieldAckName, v)) +} + +// AckNameNEQ applies the NEQ predicate on the "ackName" field. +func AckNameNEQ(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldNEQ(FieldAckName, v)) +} + +// AckNameIn applies the In predicate on the "ackName" field. +func AckNameIn(vs ...string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldIn(FieldAckName, vs...)) +} + +// AckNameNotIn applies the NotIn predicate on the "ackName" field. +func AckNameNotIn(vs ...string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldNotIn(FieldAckName, vs...)) +} + +// AckNameGT applies the GT predicate on the "ackName" field. +func AckNameGT(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldGT(FieldAckName, v)) +} + +// AckNameGTE applies the GTE predicate on the "ackName" field. +func AckNameGTE(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldGTE(FieldAckName, v)) +} + +// AckNameLT applies the LT predicate on the "ackName" field. +func AckNameLT(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldLT(FieldAckName, v)) +} + +// AckNameLTE applies the LTE predicate on the "ackName" field. +func AckNameLTE(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldLTE(FieldAckName, v)) +} + +// AckNameContains applies the Contains predicate on the "ackName" field. +func AckNameContains(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldContains(FieldAckName, v)) +} + +// AckNameHasPrefix applies the HasPrefix predicate on the "ackName" field. +func AckNameHasPrefix(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldHasPrefix(FieldAckName, v)) +} + +// AckNameHasSuffix applies the HasSuffix predicate on the "ackName" field. +func AckNameHasSuffix(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldHasSuffix(FieldAckName, v)) +} + +// AckNameEqualFold applies the EqualFold predicate on the "ackName" field. +func AckNameEqualFold(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldEqualFold(FieldAckName, v)) +} + +// AckNameContainsFold applies the ContainsFold predicate on the "ackName" field. +func AckNameContainsFold(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldContainsFold(FieldAckName, v)) +} + +// AckPhoneEQ applies the EQ predicate on the "ackPhone" field. +func AckPhoneEQ(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldEQ(FieldAckPhone, v)) +} + +// AckPhoneNEQ applies the NEQ predicate on the "ackPhone" field. +func AckPhoneNEQ(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldNEQ(FieldAckPhone, v)) +} + +// AckPhoneIn applies the In predicate on the "ackPhone" field. +func AckPhoneIn(vs ...string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldIn(FieldAckPhone, vs...)) +} + +// AckPhoneNotIn applies the NotIn predicate on the "ackPhone" field. +func AckPhoneNotIn(vs ...string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldNotIn(FieldAckPhone, vs...)) +} + +// AckPhoneGT applies the GT predicate on the "ackPhone" field. +func AckPhoneGT(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldGT(FieldAckPhone, v)) +} + +// AckPhoneGTE applies the GTE predicate on the "ackPhone" field. +func AckPhoneGTE(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldGTE(FieldAckPhone, v)) +} + +// AckPhoneLT applies the LT predicate on the "ackPhone" field. +func AckPhoneLT(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldLT(FieldAckPhone, v)) +} + +// AckPhoneLTE applies the LTE predicate on the "ackPhone" field. +func AckPhoneLTE(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldLTE(FieldAckPhone, v)) +} + +// AckPhoneContains applies the Contains predicate on the "ackPhone" field. +func AckPhoneContains(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldContains(FieldAckPhone, v)) +} + +// AckPhoneHasPrefix applies the HasPrefix predicate on the "ackPhone" field. +func AckPhoneHasPrefix(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldHasPrefix(FieldAckPhone, v)) +} + +// AckPhoneHasSuffix applies the HasSuffix predicate on the "ackPhone" field. +func AckPhoneHasSuffix(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldHasSuffix(FieldAckPhone, v)) +} + +// AckPhoneEqualFold applies the EqualFold predicate on the "ackPhone" field. +func AckPhoneEqualFold(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldEqualFold(FieldAckPhone, v)) +} + +// AckPhoneContainsFold applies the ContainsFold predicate on the "ackPhone" field. +func AckPhoneContainsFold(v string) predicate.BackupRecord { + return predicate.BackupRecord(sql.FieldContainsFold(FieldAckPhone, v)) +} + // And groups predicates with the AND operator between them. func And(predicates ...predicate.BackupRecord) predicate.BackupRecord { return predicate.BackupRecord(sql.AndPredicates(predicates...)) diff --git a/bj_power_mes/ent/backuprecord_create.go b/bj_power_mes/ent/backuprecord_create.go index 3d45db6..c8ce17d 100644 --- a/bj_power_mes/ent/backuprecord_create.go +++ b/bj_power_mes/ent/backuprecord_create.go @@ -127,6 +127,34 @@ func (_c *BackupRecordCreate) SetNillableScope(v *string) *BackupRecordCreate { return _c } +// SetAckName sets the "ackName" field. +func (_c *BackupRecordCreate) SetAckName(v string) *BackupRecordCreate { + _c.mutation.SetAckName(v) + return _c +} + +// SetNillableAckName sets the "ackName" field if the given value is not nil. +func (_c *BackupRecordCreate) SetNillableAckName(v *string) *BackupRecordCreate { + if v != nil { + _c.SetAckName(*v) + } + return _c +} + +// SetAckPhone sets the "ackPhone" field. +func (_c *BackupRecordCreate) SetAckPhone(v string) *BackupRecordCreate { + _c.mutation.SetAckPhone(v) + return _c +} + +// SetNillableAckPhone sets the "ackPhone" field if the given value is not nil. +func (_c *BackupRecordCreate) SetNillableAckPhone(v *string) *BackupRecordCreate { + if v != nil { + _c.SetAckPhone(*v) + } + return _c +} + // SetID sets the "id" field. func (_c *BackupRecordCreate) SetID(v int) *BackupRecordCreate { _c.mutation.SetID(v) @@ -192,6 +220,14 @@ func (_c *BackupRecordCreate) defaults() { v := backuprecord.DefaultScope _c.mutation.SetScope(v) } + if _, ok := _c.mutation.AckName(); !ok { + v := backuprecord.DefaultAckName + _c.mutation.SetAckName(v) + } + if _, ok := _c.mutation.AckPhone(); !ok { + v := backuprecord.DefaultAckPhone + _c.mutation.SetAckPhone(v) + } } // check runs all checks and user-defined validators on the builder. @@ -246,6 +282,22 @@ func (_c *BackupRecordCreate) check() error { return &ValidationError{Name: "scope", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.scope": %w`, err)} } } + if _, ok := _c.mutation.AckName(); !ok { + return &ValidationError{Name: "ackName", err: errors.New(`ent: missing required field "BackupRecord.ackName"`)} + } + if v, ok := _c.mutation.AckName(); ok { + if err := backuprecord.AckNameValidator(v); err != nil { + return &ValidationError{Name: "ackName", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.ackName": %w`, err)} + } + } + if _, ok := _c.mutation.AckPhone(); !ok { + return &ValidationError{Name: "ackPhone", err: errors.New(`ent: missing required field "BackupRecord.ackPhone"`)} + } + if v, ok := _c.mutation.AckPhone(); ok { + if err := backuprecord.AckPhoneValidator(v); err != nil { + return &ValidationError{Name: "ackPhone", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.ackPhone": %w`, err)} + } + } if v, ok := _c.mutation.ID(); ok { if err := backuprecord.IDValidator(v); err != nil { return &ValidationError{Name: "id", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.id": %w`, err)} @@ -323,6 +375,14 @@ func (_c *BackupRecordCreate) createSpec() (*BackupRecord, *sqlgraph.CreateSpec) _spec.SetField(backuprecord.FieldScope, field.TypeString, value) _node.Scope = value } + if value, ok := _c.mutation.AckName(); ok { + _spec.SetField(backuprecord.FieldAckName, field.TypeString, value) + _node.AckName = value + } + if value, ok := _c.mutation.AckPhone(); ok { + _spec.SetField(backuprecord.FieldAckPhone, field.TypeString, value) + _node.AckPhone = value + } return _node, _spec } diff --git a/bj_power_mes/ent/backuprecord_update.go b/bj_power_mes/ent/backuprecord_update.go index 0f8291a..7b599e7 100644 --- a/bj_power_mes/ent/backuprecord_update.go +++ b/bj_power_mes/ent/backuprecord_update.go @@ -196,6 +196,34 @@ func (_u *BackupRecordUpdate) SetNillableScope(v *string) *BackupRecordUpdate { return _u } +// SetAckName sets the "ackName" field. +func (_u *BackupRecordUpdate) SetAckName(v string) *BackupRecordUpdate { + _u.mutation.SetAckName(v) + return _u +} + +// SetNillableAckName sets the "ackName" field if the given value is not nil. +func (_u *BackupRecordUpdate) SetNillableAckName(v *string) *BackupRecordUpdate { + if v != nil { + _u.SetAckName(*v) + } + return _u +} + +// SetAckPhone sets the "ackPhone" field. +func (_u *BackupRecordUpdate) SetAckPhone(v string) *BackupRecordUpdate { + _u.mutation.SetAckPhone(v) + return _u +} + +// SetNillableAckPhone sets the "ackPhone" field if the given value is not nil. +func (_u *BackupRecordUpdate) SetNillableAckPhone(v *string) *BackupRecordUpdate { + if v != nil { + _u.SetAckPhone(*v) + } + return _u +} + // Mutation returns the BackupRecordMutation object of the builder. func (_u *BackupRecordUpdate) Mutation() *BackupRecordMutation { return _u.mutation @@ -250,6 +278,16 @@ func (_u *BackupRecordUpdate) check() error { return &ValidationError{Name: "scope", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.scope": %w`, err)} } } + if v, ok := _u.mutation.AckName(); ok { + if err := backuprecord.AckNameValidator(v); err != nil { + return &ValidationError{Name: "ackName", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.ackName": %w`, err)} + } + } + if v, ok := _u.mutation.AckPhone(); ok { + if err := backuprecord.AckPhoneValidator(v); err != nil { + return &ValidationError{Name: "ackPhone", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.ackPhone": %w`, err)} + } + } return nil } @@ -313,6 +351,12 @@ func (_u *BackupRecordUpdate) sqlSave(ctx context.Context) (_node int, err error if value, ok := _u.mutation.Scope(); ok { _spec.SetField(backuprecord.FieldScope, field.TypeString, value) } + if value, ok := _u.mutation.AckName(); ok { + _spec.SetField(backuprecord.FieldAckName, field.TypeString, value) + } + if value, ok := _u.mutation.AckPhone(); ok { + _spec.SetField(backuprecord.FieldAckPhone, field.TypeString, value) + } _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { if _, ok := err.(*sqlgraph.NotFoundError); ok { @@ -503,6 +547,34 @@ func (_u *BackupRecordUpdateOne) SetNillableScope(v *string) *BackupRecordUpdate return _u } +// SetAckName sets the "ackName" field. +func (_u *BackupRecordUpdateOne) SetAckName(v string) *BackupRecordUpdateOne { + _u.mutation.SetAckName(v) + return _u +} + +// SetNillableAckName sets the "ackName" field if the given value is not nil. +func (_u *BackupRecordUpdateOne) SetNillableAckName(v *string) *BackupRecordUpdateOne { + if v != nil { + _u.SetAckName(*v) + } + return _u +} + +// SetAckPhone sets the "ackPhone" field. +func (_u *BackupRecordUpdateOne) SetAckPhone(v string) *BackupRecordUpdateOne { + _u.mutation.SetAckPhone(v) + return _u +} + +// SetNillableAckPhone sets the "ackPhone" field if the given value is not nil. +func (_u *BackupRecordUpdateOne) SetNillableAckPhone(v *string) *BackupRecordUpdateOne { + if v != nil { + _u.SetAckPhone(*v) + } + return _u +} + // Mutation returns the BackupRecordMutation object of the builder. func (_u *BackupRecordUpdateOne) Mutation() *BackupRecordMutation { return _u.mutation @@ -570,6 +642,16 @@ func (_u *BackupRecordUpdateOne) check() error { return &ValidationError{Name: "scope", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.scope": %w`, err)} } } + if v, ok := _u.mutation.AckName(); ok { + if err := backuprecord.AckNameValidator(v); err != nil { + return &ValidationError{Name: "ackName", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.ackName": %w`, err)} + } + } + if v, ok := _u.mutation.AckPhone(); ok { + if err := backuprecord.AckPhoneValidator(v); err != nil { + return &ValidationError{Name: "ackPhone", err: fmt.Errorf(`ent: validator failed for field "BackupRecord.ackPhone": %w`, err)} + } + } return nil } @@ -650,6 +732,12 @@ func (_u *BackupRecordUpdateOne) sqlSave(ctx context.Context) (_node *BackupReco if value, ok := _u.mutation.Scope(); ok { _spec.SetField(backuprecord.FieldScope, field.TypeString, value) } + if value, ok := _u.mutation.AckName(); ok { + _spec.SetField(backuprecord.FieldAckName, field.TypeString, value) + } + if value, ok := _u.mutation.AckPhone(); ok { + _spec.SetField(backuprecord.FieldAckPhone, field.TypeString, value) + } _spec.AddModifiers(_u.modifiers...) _node = &BackupRecord{config: _u.config} _spec.Assign = _node.assignValues diff --git a/bj_power_mes/ent/migrate/schema.go b/bj_power_mes/ent/migrate/schema.go index 048a459..e3b2202 100644 --- a/bj_power_mes/ent/migrate/schema.go +++ b/bj_power_mes/ent/migrate/schema.go @@ -171,6 +171,9 @@ var ( {Name: "deleted", Type: field.TypeBool, Comment: "逻辑删除", Default: false}, {Name: "deleted_at", Type: field.TypeInt64, Comment: "删除时间(unix秒)", Default: 0}, {Name: "deleted_by", Type: field.TypeString, Size: 64, Comment: "删除人", Default: ""}, + {Name: "deleted_reason", Type: field.TypeString, Size: 255, Comment: "删除说明(删除弹窗填写,警示留痕)", Default: ""}, + {Name: "purged_at", Type: field.TypeInt64, Comment: "彻底清除时间(unix秒,仅删文件留索引)", Default: 0}, + {Name: "purged_by", Type: field.TypeString, Size: 64, Comment: "彻底清除操作人", Default: ""}, } // AttachmentTable holds the schema information for the "attachment" table. AttachmentTable = &schema.Table{ @@ -210,10 +213,12 @@ var ( {Name: "backup_path", Type: field.TypeString, Comment: "备份包(zip)在目标盘的完整路径"}, {Name: "total_size", Type: field.TypeInt64, Comment: "备份包总字节数", Default: 0}, {Name: "items_json", Type: field.TypeString, Comment: "各数据项及大小(JSON数组:[{name,rows,bytes}])"}, - {Name: "status", Type: field.TypeString, Size: 16, Comment: "success/failed/partial", Default: "success"}, + {Name: "status", Type: field.TypeString, Size: 16, Comment: "success/failed/partial/cleanup/cleanup_forced", Default: "success"}, {Name: "operator", Type: field.TypeString, Size: 64, Comment: "操作人", Default: ""}, {Name: "checksum", Type: field.TypeString, Size: 64, Comment: "备份包校验和(sha256,基于 manifest)", Default: ""}, {Name: "scope", Type: field.TypeString, Size: 8, Comment: "写入方 mes/wms", Default: "mes"}, + {Name: "ack_name", Type: field.TypeString, Size: 64, Comment: "强制清理时填写姓名(警示留痕,非强制清理为空)", Default: ""}, + {Name: "ack_phone", Type: field.TypeString, Size: 32, Comment: "强制清理时填写手机号(警示留痕,非强制清理为空)", Default: ""}, } // BackupRecordTable holds the schema information for the "backup_record" table. BackupRecordTable = &schema.Table{ diff --git a/bj_power_mes/ent/mutation.go b/bj_power_mes/ent/mutation.go index f67fe0e..83053de 100644 --- a/bj_power_mes/ent/mutation.go +++ b/bj_power_mes/ent/mutation.go @@ -3777,6 +3777,10 @@ type AttachmentMutation struct { deletedAt *int64 adddeletedAt *int64 deletedBy *string + deletedReason *string + purgedAt *int64 + addpurgedAt *int64 + purgedBy *string clearedFields map[string]struct{} done bool oldValue func(context.Context) (*Attachment, error) @@ -4523,6 +4527,134 @@ func (m *AttachmentMutation) ResetDeletedBy() { m.deletedBy = nil } +// SetDeletedReason sets the "deletedReason" field. +func (m *AttachmentMutation) SetDeletedReason(s string) { + m.deletedReason = &s +} + +// DeletedReason returns the value of the "deletedReason" field in the mutation. +func (m *AttachmentMutation) DeletedReason() (r string, exists bool) { + v := m.deletedReason + if v == nil { + return + } + return *v, true +} + +// OldDeletedReason returns the old "deletedReason" field's value of the Attachment entity. +// If the Attachment object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AttachmentMutation) OldDeletedReason(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldDeletedReason is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldDeletedReason requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldDeletedReason: %w", err) + } + return oldValue.DeletedReason, nil +} + +// ResetDeletedReason resets all changes to the "deletedReason" field. +func (m *AttachmentMutation) ResetDeletedReason() { + m.deletedReason = nil +} + +// SetPurgedAt sets the "purgedAt" field. +func (m *AttachmentMutation) SetPurgedAt(i int64) { + m.purgedAt = &i + m.addpurgedAt = nil +} + +// PurgedAt returns the value of the "purgedAt" field in the mutation. +func (m *AttachmentMutation) PurgedAt() (r int64, exists bool) { + v := m.purgedAt + if v == nil { + return + } + return *v, true +} + +// OldPurgedAt returns the old "purgedAt" field's value of the Attachment entity. +// If the Attachment object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AttachmentMutation) OldPurgedAt(ctx context.Context) (v int64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldPurgedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldPurgedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldPurgedAt: %w", err) + } + return oldValue.PurgedAt, nil +} + +// AddPurgedAt adds i to the "purgedAt" field. +func (m *AttachmentMutation) AddPurgedAt(i int64) { + if m.addpurgedAt != nil { + *m.addpurgedAt += i + } else { + m.addpurgedAt = &i + } +} + +// AddedPurgedAt returns the value that was added to the "purgedAt" field in this mutation. +func (m *AttachmentMutation) AddedPurgedAt() (r int64, exists bool) { + v := m.addpurgedAt + if v == nil { + return + } + return *v, true +} + +// ResetPurgedAt resets all changes to the "purgedAt" field. +func (m *AttachmentMutation) ResetPurgedAt() { + m.purgedAt = nil + m.addpurgedAt = nil +} + +// SetPurgedBy sets the "purgedBy" field. +func (m *AttachmentMutation) SetPurgedBy(s string) { + m.purgedBy = &s +} + +// PurgedBy returns the value of the "purgedBy" field in the mutation. +func (m *AttachmentMutation) PurgedBy() (r string, exists bool) { + v := m.purgedBy + if v == nil { + return + } + return *v, true +} + +// OldPurgedBy returns the old "purgedBy" field's value of the Attachment entity. +// If the Attachment object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AttachmentMutation) OldPurgedBy(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldPurgedBy is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldPurgedBy requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldPurgedBy: %w", err) + } + return oldValue.PurgedBy, nil +} + +// ResetPurgedBy resets all changes to the "purgedBy" field. +func (m *AttachmentMutation) ResetPurgedBy() { + m.purgedBy = nil +} + // Where appends a list predicates to the AttachmentMutation builder. func (m *AttachmentMutation) Where(ps ...predicate.Attachment) { m.predicates = append(m.predicates, ps...) @@ -4557,7 +4689,7 @@ func (m *AttachmentMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *AttachmentMutation) Fields() []string { - fields := make([]string, 0, 16) + fields := make([]string, 0, 19) if m.bizType != nil { fields = append(fields, attachment.FieldBizType) } @@ -4606,6 +4738,15 @@ func (m *AttachmentMutation) Fields() []string { if m.deletedBy != nil { fields = append(fields, attachment.FieldDeletedBy) } + if m.deletedReason != nil { + fields = append(fields, attachment.FieldDeletedReason) + } + if m.purgedAt != nil { + fields = append(fields, attachment.FieldPurgedAt) + } + if m.purgedBy != nil { + fields = append(fields, attachment.FieldPurgedBy) + } return fields } @@ -4646,6 +4787,12 @@ func (m *AttachmentMutation) Field(name string) (ent.Value, bool) { return m.DeletedAt() case attachment.FieldDeletedBy: return m.DeletedBy() + case attachment.FieldDeletedReason: + return m.DeletedReason() + case attachment.FieldPurgedAt: + return m.PurgedAt() + case attachment.FieldPurgedBy: + return m.PurgedBy() } return nil, false } @@ -4687,6 +4834,12 @@ func (m *AttachmentMutation) OldField(ctx context.Context, name string) (ent.Val return m.OldDeletedAt(ctx) case attachment.FieldDeletedBy: return m.OldDeletedBy(ctx) + case attachment.FieldDeletedReason: + return m.OldDeletedReason(ctx) + case attachment.FieldPurgedAt: + return m.OldPurgedAt(ctx) + case attachment.FieldPurgedBy: + return m.OldPurgedBy(ctx) } return nil, fmt.Errorf("unknown Attachment field %s", name) } @@ -4808,6 +4961,27 @@ func (m *AttachmentMutation) SetField(name string, value ent.Value) error { } m.SetDeletedBy(v) return nil + case attachment.FieldDeletedReason: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetDeletedReason(v) + return nil + case attachment.FieldPurgedAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetPurgedAt(v) + return nil + case attachment.FieldPurgedBy: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetPurgedBy(v) + return nil } return fmt.Errorf("unknown Attachment field %s", name) } @@ -4825,6 +4999,9 @@ func (m *AttachmentMutation) AddedFields() []string { if m.adddeletedAt != nil { fields = append(fields, attachment.FieldDeletedAt) } + if m.addpurgedAt != nil { + fields = append(fields, attachment.FieldPurgedAt) + } return fields } @@ -4839,6 +5016,8 @@ func (m *AttachmentMutation) AddedField(name string) (ent.Value, bool) { return m.AddedArchivedAt() case attachment.FieldDeletedAt: return m.AddedDeletedAt() + case attachment.FieldPurgedAt: + return m.AddedPurgedAt() } return nil, false } @@ -4869,6 +5048,13 @@ func (m *AttachmentMutation) AddField(name string, value ent.Value) error { } m.AddDeletedAt(v) return nil + case attachment.FieldPurgedAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddPurgedAt(v) + return nil } return fmt.Errorf("unknown Attachment numeric field %s", name) } @@ -4944,6 +5130,15 @@ func (m *AttachmentMutation) ResetField(name string) error { case attachment.FieldDeletedBy: m.ResetDeletedBy() return nil + case attachment.FieldDeletedReason: + m.ResetDeletedReason() + return nil + case attachment.FieldPurgedAt: + m.ResetPurgedAt() + return nil + case attachment.FieldPurgedBy: + m.ResetPurgedBy() + return nil } return fmt.Errorf("unknown Attachment field %s", name) } @@ -5016,6 +5211,8 @@ type BackupRecordMutation struct { operator *string checksum *string scope *string + ackName *string + ackPhone *string clearedFields map[string]struct{} done bool oldValue func(context.Context) (*BackupRecord, error) @@ -5566,6 +5763,78 @@ func (m *BackupRecordMutation) ResetScope() { m.scope = nil } +// SetAckName sets the "ackName" field. +func (m *BackupRecordMutation) SetAckName(s string) { + m.ackName = &s +} + +// AckName returns the value of the "ackName" field in the mutation. +func (m *BackupRecordMutation) AckName() (r string, exists bool) { + v := m.ackName + if v == nil { + return + } + return *v, true +} + +// OldAckName returns the old "ackName" field's value of the BackupRecord entity. +// If the BackupRecord object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *BackupRecordMutation) OldAckName(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldAckName is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldAckName requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldAckName: %w", err) + } + return oldValue.AckName, nil +} + +// ResetAckName resets all changes to the "ackName" field. +func (m *BackupRecordMutation) ResetAckName() { + m.ackName = nil +} + +// SetAckPhone sets the "ackPhone" field. +func (m *BackupRecordMutation) SetAckPhone(s string) { + m.ackPhone = &s +} + +// AckPhone returns the value of the "ackPhone" field in the mutation. +func (m *BackupRecordMutation) AckPhone() (r string, exists bool) { + v := m.ackPhone + if v == nil { + return + } + return *v, true +} + +// OldAckPhone returns the old "ackPhone" field's value of the BackupRecord entity. +// If the BackupRecord object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *BackupRecordMutation) OldAckPhone(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldAckPhone is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldAckPhone requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldAckPhone: %w", err) + } + return oldValue.AckPhone, nil +} + +// ResetAckPhone resets all changes to the "ackPhone" field. +func (m *BackupRecordMutation) ResetAckPhone() { + m.ackPhone = nil +} + // Where appends a list predicates to the BackupRecordMutation builder. func (m *BackupRecordMutation) Where(ps ...predicate.BackupRecord) { m.predicates = append(m.predicates, ps...) @@ -5600,7 +5869,7 @@ func (m *BackupRecordMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *BackupRecordMutation) Fields() []string { - fields := make([]string, 0, 10) + fields := make([]string, 0, 12) if m.executedAt != nil { fields = append(fields, backuprecord.FieldExecutedAt) } @@ -5631,6 +5900,12 @@ func (m *BackupRecordMutation) Fields() []string { if m.scope != nil { fields = append(fields, backuprecord.FieldScope) } + if m.ackName != nil { + fields = append(fields, backuprecord.FieldAckName) + } + if m.ackPhone != nil { + fields = append(fields, backuprecord.FieldAckPhone) + } return fields } @@ -5659,6 +5934,10 @@ func (m *BackupRecordMutation) Field(name string) (ent.Value, bool) { return m.Checksum() case backuprecord.FieldScope: return m.Scope() + case backuprecord.FieldAckName: + return m.AckName() + case backuprecord.FieldAckPhone: + return m.AckPhone() } return nil, false } @@ -5688,6 +5967,10 @@ func (m *BackupRecordMutation) OldField(ctx context.Context, name string) (ent.V return m.OldChecksum(ctx) case backuprecord.FieldScope: return m.OldScope(ctx) + case backuprecord.FieldAckName: + return m.OldAckName(ctx) + case backuprecord.FieldAckPhone: + return m.OldAckPhone(ctx) } return nil, fmt.Errorf("unknown BackupRecord field %s", name) } @@ -5767,6 +6050,20 @@ func (m *BackupRecordMutation) SetField(name string, value ent.Value) error { } m.SetScope(v) return nil + case backuprecord.FieldAckName: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetAckName(v) + return nil + case backuprecord.FieldAckPhone: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetAckPhone(v) + return nil } return fmt.Errorf("unknown BackupRecord field %s", name) } @@ -5897,6 +6194,12 @@ func (m *BackupRecordMutation) ResetField(name string) error { case backuprecord.FieldScope: m.ResetScope() return nil + case backuprecord.FieldAckName: + m.ResetAckName() + return nil + case backuprecord.FieldAckPhone: + m.ResetAckPhone() + return nil } return fmt.Errorf("unknown BackupRecord field %s", name) } diff --git a/bj_power_mes/ent/runtime.go b/bj_power_mes/ent/runtime.go index b2457d6..9758676 100644 --- a/bj_power_mes/ent/runtime.go +++ b/bj_power_mes/ent/runtime.go @@ -345,6 +345,22 @@ func init() { attachment.DefaultDeletedBy = attachmentDescDeletedBy.Default.(string) // attachment.DeletedByValidator is a validator for the "deletedBy" field. It is called by the builders before save. attachment.DeletedByValidator = attachmentDescDeletedBy.Validators[0].(func(string) error) + // attachmentDescDeletedReason is the schema descriptor for deletedReason field. + attachmentDescDeletedReason := attachmentFields[17].Descriptor() + // attachment.DefaultDeletedReason holds the default value on creation for the deletedReason field. + attachment.DefaultDeletedReason = attachmentDescDeletedReason.Default.(string) + // attachment.DeletedReasonValidator is a validator for the "deletedReason" field. It is called by the builders before save. + attachment.DeletedReasonValidator = attachmentDescDeletedReason.Validators[0].(func(string) error) + // attachmentDescPurgedAt is the schema descriptor for purgedAt field. + attachmentDescPurgedAt := attachmentFields[18].Descriptor() + // attachment.DefaultPurgedAt holds the default value on creation for the purgedAt field. + attachment.DefaultPurgedAt = attachmentDescPurgedAt.Default.(int64) + // attachmentDescPurgedBy is the schema descriptor for purgedBy field. + attachmentDescPurgedBy := attachmentFields[19].Descriptor() + // attachment.DefaultPurgedBy holds the default value on creation for the purgedBy field. + attachment.DefaultPurgedBy = attachmentDescPurgedBy.Default.(string) + // attachment.PurgedByValidator is a validator for the "purgedBy" field. It is called by the builders before save. + attachment.PurgedByValidator = attachmentDescPurgedBy.Validators[0].(func(string) error) // attachmentDescID is the schema descriptor for id field. attachmentDescID := attachmentFields[0].Descriptor() // attachment.IDValidator is a validator for the "id" field. It is called by the builders before save. @@ -383,6 +399,18 @@ func init() { backuprecord.DefaultScope = backuprecordDescScope.Default.(string) // backuprecord.ScopeValidator is a validator for the "scope" field. It is called by the builders before save. backuprecord.ScopeValidator = backuprecordDescScope.Validators[0].(func(string) error) + // backuprecordDescAckName is the schema descriptor for ackName field. + backuprecordDescAckName := backuprecordFields[11].Descriptor() + // backuprecord.DefaultAckName holds the default value on creation for the ackName field. + backuprecord.DefaultAckName = backuprecordDescAckName.Default.(string) + // backuprecord.AckNameValidator is a validator for the "ackName" field. It is called by the builders before save. + backuprecord.AckNameValidator = backuprecordDescAckName.Validators[0].(func(string) error) + // backuprecordDescAckPhone is the schema descriptor for ackPhone field. + backuprecordDescAckPhone := backuprecordFields[12].Descriptor() + // backuprecord.DefaultAckPhone holds the default value on creation for the ackPhone field. + backuprecord.DefaultAckPhone = backuprecordDescAckPhone.Default.(string) + // backuprecord.AckPhoneValidator is a validator for the "ackPhone" field. It is called by the builders before save. + backuprecord.AckPhoneValidator = backuprecordDescAckPhone.Validators[0].(func(string) error) // backuprecordDescID is the schema descriptor for id field. backuprecordDescID := backuprecordFields[0].Descriptor() // backuprecord.IDValidator is a validator for the "id" field. It is called by the builders before save. diff --git a/bj_power_mes/frontend/src/components/AttachmentPanel.vue b/bj_power_mes/frontend/src/components/AttachmentPanel.vue index 32f0dd6..1ff4fc9 100644 --- a/bj_power_mes/frontend/src/components/AttachmentPanel.vue +++ b/bj_power_mes/frontend/src/components/AttachmentPanel.vue @@ -6,7 +6,7 @@ defineOptions({ name: 'AttachmentPanel' }) import { ref, watch } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import request from '../utils/request' -import { getToken } from '../utils/auth' +import { getToken, getUser } from '../utils/auth' import { fmtTime } from '../utils/format' const props = defineProps({ @@ -81,15 +81,25 @@ function download(row) { .catch(() => ElMessage.error('下载失败')) } +// 移除:上传人本人撤回误传附件(物理删除文件+记录,不可恢复)。 +// 仅对自己上传的附件显示;历史附件的清理走「数据归档 → 磁盘空间回收」(管理员)。 +const me = (getUser() && getUser().username) || '' +const canRemove = (row) => row.uploader && row.uploader === me async function remove(row) { try { - await ElMessageBox.confirm(`确认删除附件「${row.fileName}」?`, '删除确认', { type: 'warning' }) + await ElMessageBox.confirm( + `确认移除附件「${row.fileName}」?移除将删除记录与磁盘文件,不可恢复(仅限撤回自己误传的附件)。`, + '移除确认', { type: 'warning', confirmButtonText: '确认移除' }) } catch { return } - await request.post('/attachment/delete', { id: row.id }) - ElMessage.success('已删除') - await load() + try { + await request.post('/attachment/remove', { id: row.id }) + ElMessage.success('已移除') + await load() + } catch (e) { + ElMessage.error(e?.response?.data?.message || e?.message || '移除失败') + } } function sizeText(n) { @@ -139,7 +149,7 @@ defineExpose({ load }) diff --git a/bj_power_mes/frontend/src/help.js b/bj_power_mes/frontend/src/help.js index db896ab..b3d5b0d 100644 --- a/bj_power_mes/frontend/src/help.js +++ b/bj_power_mes/frontend/src/help.js @@ -224,8 +224,8 @@ export const helpLineManagement = { { name: '主线缓存位 C1~C15', source: 'PLC 传感器(§4.1,一次性读取)。', purpose: '主线缓存位当前是否有托盘', fill: '只读;点「刷新」更新' }, { name: '接驳台编码', source: '手工录入(2~16 位大写字母/数字,不可与现有编码重复)。', purpose: '接驳台唯一标识', fill: '新增/编辑时必填' }, { name: '接驳台名称', source: '手工录入。', purpose: '接驳台显示名称', fill: '必填' }, - { name: '类型', source: '产线 / 库房 / 其他。', purpose: '区分接驳台所在位置', fill: '产线类型必须绑定工位 1~12' }, - { name: '绑定工位', source: '手工选择(1~12)。', purpose: '该接驳台服务的产线工位号', fill: '产线类型必填;库房/其他不绑工位' }, + { name: '类型', source: '产线 / 库房 / 其他。', purpose: '区分接驳台所在位置', fill: '产线类型(DOCKnn)自动派生所属工位,库房/其他不绑工位' }, + { name: '绑定工位', source: '由接驳台编码派生(DOCKnn → 工位 (nn+1)/2),硬件级对应关系,不可编辑。', purpose: '该接驳台服务的产线工位号', fill: '产线类型自动展示;库房/其他不绑工位' }, { name: '启用状态', source: '启用 / 停用。', purpose: '停用后不出现在 AGV 派车等下拉中', fill: '行内「停用/启用」切换' }, { name: '占用状态', source: 'PLC 托盘传感器。', purpose: '当前是否有托盘', fill: '只读,不可人工维护' }, { name: '工件位置纠正', source: '系统按 MES 记录 vs PLC 实际自动列出。', purpose: '把记录过期/错位的工件位置清为「不在工位」', fill: '行内「纠正」,二次确认后生效并记日志' }, @@ -462,12 +462,13 @@ export const helpInspect = { export const helpProcessCard = { title: '生产流程卡(工单维度主卡)', overview: - '本页以**工单**为唯一主键,展示该工单的「生产实绩 / 追溯卡」:工序实绩、用料清单、成品明细与签字确认;并保留成品 SN 维度的追溯子视图。\n\n三个查询入口(数据源同一套):\n· 产品工号 → 工单主卡(首选);\n· 成品SN → 成品追溯卡(SN 维度,逐件追溯工序/用料/拧紧/签字);\n· 产品型号 → 该型号下的工单列表(仅筛选入口,点行内「查看主卡」回到工单维度)。\n\n概念统一:物料「类型」(结构件/电气件/其他)取自 WMS 物料档案 manage_mode;物料「序列号」(序列号=是逐件录 SN / 序列号=否按批)两维严格分离。用料清单按 序列号=是 / 序列号=否 两组分别展示。\n\n用料清单数据来自装配实绩(工位终端装机绑定 workpiece_bind):序列号=是列出每件实际 SN,序列号=否列出批次号。\n\n签字区:操作工 / 检验员 / 审核人 按实际签字人展示(含签字次数与最近时间),单据级「批准人」留手签空位,系统不代填、不加字段。\n\n打印/导出:点「打印 / 导出 PDF」,系统在新窗口打开排版好的 A4 卡片版式,浏览器打印选「另存为 PDF」即导出电子档。\n\n分工:本页是**工单维度主卡**(看一整单的工艺实绩/用料/签字);单件 SN 全链路履历(含装机绑定、物料清单递归组成、暂存退库、检验记录)由「工件追溯」页按 SN 入口提供。两者数据同源,按"查整单进度"还是"查单件履历"互补选择。', + '本页以**工单**为唯一主键,展示该工单的「生产实绩 / 追溯卡」:工序实绩、用料清单(序列号=是/序列号=否两组,物料类型取自 WMS 物料档案)、成品明细与签字确认;并保留成品 SN 维度的追溯子视图。\n\n页面为**单页布局**(原"流程卡列表 / 流程卡详情"两个页签已合并):主视图是流程卡列表(支持产品工号 / 产品型号 / 成品SN 关键字筛选),点行内「详情」在右侧抽屉打开完整卡片;工具栏的「SN追溯卡」输入框用于按成品 SN 直接查追溯卡。\n\n备份/导出(客户习惯叫"备份",即导出文件保存到本机,与「数据归档」的数据库备份是两回事):\n· 格式三选一:PDF(新窗口打开排版好的 A4 版式,浏览器里另存为 PDF)、Excel(CSV,双击即用 Excel 打开)、打印版(新窗口打开并直接弹出打印对话框);\n· 单张:详情抽屉右上角「导出」;\n· **批量**:在列表中勾选多张卡,点工具栏「备份导出」→ 范围可选"已勾选 N 张"或"当前筛选结果全部" → 确认。PDF/打印版会把多张卡合并到一个新窗口(每张卡独占一页);Excel 合并为一个 CSV 文件。单次最多 100 张。\n\n概念统一:物料「序列号」(序列号=是逐件录 SN / 序列号=否按批)两维严格分离,用料清单按两组分别展示;数据来自装配实绩(工位终端装机绑定 workpiece_bind)。\n\n签字区:操作工 / 检验员 / 审核人 按实际签字人展示(含签字次数与最近时间),单据级「批准人」留手签空位,系统不代填、不加字段。\n\n分工:本页是**工单维度主卡**(看一整单的工艺实绩/用料/签字);单件 SN 全链路履历(含装机绑定、物料清单递归组成、暂存退库、检验记录)由「工件追溯」页按 SN 入口提供。两者数据同源,按"查整单进度"还是"查单件履历"互补选择。', fields: [ - { name: '产品型号', source: '下拉选择,来自「物料档案」页(WMS 物料主数据)。', purpose: '按型号筛选其下工单列表', fill: '选定后清空产品工号/SN,进入型号筛选模式' }, - { name: '产品工号', source: '手工填写。', purpose: '直接查某工单的生产流程卡主卡', fill: '回车或点查询' }, - { name: '成品SN', source: '手工填写。', purpose: '查某成品的 SN 追溯卡', fill: '回车或点查询' }, - { name: '时间范围', source: '日历选择(月范围)。', purpose: '仅在型号筛选模式下过滤工单列表', fill: '默认上月;不选=全部时间' }, + { name: '产品型号', source: '筛选输入框。', purpose: '按型号过滤流程卡列表(可配合工号/SN 关键字)', fill: '回车或点查询' }, + { name: '产品工号', source: '筛选输入框。', purpose: '过滤某工号;点行内「详情」看完整主卡', fill: '回车或点查询' }, + { name: '成品SN/关键字', source: '筛选输入框。', purpose: '按成品 SN 或关键字过滤列表', fill: '回车或点查询' }, + { name: 'SN追溯卡', source: '工具栏输入框。', purpose: '按成品 SN 直接打开追溯卡(逐件追溯工序/用料/拧紧/签字)', fill: '输入 SN 回车,抽屉展示' }, + { name: '备份导出', source: '列表工具栏按钮 + 详情抽屉「导出」按钮。', purpose: '单张/批量把流程卡备份为 PDF / Excel / 打印版文件', fill: '勾选多张 → 点「备份导出」→ 选格式与范围 → 确认;范围可选"已勾选 N 张"或"当前筛选结果全部"' }, { name: '工序实绩-审核人', source: '自动带出该工序的审核签字人及审核时间。', purpose: '工序级审核放行留痕', fill: '无则显示“-”' } ] } @@ -569,7 +570,7 @@ export const helpAlertRule = { export const helpAttachment = { title: '附件中心(统一存储与查阅)', overview: - '附件中心集中登记并查阅全系统附件(图纸、检验照片、检验报告、工艺、流程卡、包装照片、Excel 导入等),新增在各业务页面内完成,本页负责查阅、下载与删除。\n\n统一存储规则:所有附件按「附件根目录/年/月/日/文件类型/文件」分层存放,文件类型目录全部大写(PROCESS_PDF、INSPECTION_PHOTO、INSPECTION_PDF、DRAWING、PROCESS_CARD、PACKAGE_PHOTO、EXCEL_IMPORT、OTHER);文件名统一用 UUID,扩展名小写,不含中文与特殊字符;数据库只存相对路径(如 2026/09/19/INSPECTION_PHOTO/xxx.jpg),不存绝对路径。附件根目录由配置文件 Upload.Dir 指定,不硬编码。\n\n上传为流式写入(边写边算 MD5),同业务对象同 MD5 自动秒传不重复占空间;单文件大小按文件类型配置上限(默认 20MB)。\n\n删除为逻辑删除:库内标记「已删除」并记录删除人/时间,物理文件保留,勾选「含已删除」可追溯。\n\n历史数据的备份与清理统一在「数据归档」页面完成(按时间窗备份到 U 盘/移动硬盘,备份覆盖后才能物理清理释放空间)。\n\n磁盘空间监控:系统每天早上 7 点自动检测磁盘剩余空间,剩余低于 20% 告警、低于 10% 提示及时备份清理(本页顶部同步横幅提示;请到「数据归档」页处理)。', + '附件中心集中登记并查阅全系统附件(图纸、检验照片、检验报告、工艺、流程卡、包装照片、Excel 导入等),新增在各业务页面内完成,本页为纯查阅页:查询、在线预览、下载、状态追溯。\n\n统一存储规则:所有附件按「附件根目录/年/月/日/文件类型/文件」分层存放,文件类型目录全部大写(PROCESS_PDF、INSPECTION_PHOTO、INSPECTION_PDF、DRAWING、PROCESS_CARD、PACKAGE_PHOTO、EXCEL_IMPORT、OTHER);文件名统一用 UUID,扩展名小写,不含中文与特殊字符;数据库只存相对路径(如 2026/09/19/INSPECTION_PHOTO/xxx.jpg),不存绝对路径。附件根目录由配置文件 Upload.Dir 指定,不硬编码。\n\n上传为流式写入(边写边算 MD5),同业务对象同 MD5 自动秒传不重复占空间;单文件大小按文件类型配置上限(默认 20MB)。\n\n状态三态:正常 / 已删除(文件仍在磁盘,彻底清除前可恢复)/ 已清除(磁盘文件已删除,索引保留可追溯)。已删除/已清除的记录悬浮可看删除人、时间、说明等前因后果;预览前会先提示。\n\n附件的删除、恢复与磁盘释放统一在「数据归档 → 磁盘空间回收」完成(需 sys.attachment:manage 权限);业务单据附件面板中,上传人本人可「移除」自己误传的附件。所有清理仅允许处理保护期(默认 180 天)之前的数据。\n\n磁盘空间监控:系统每天早上 7 点自动检测磁盘剩余空间,剩余低于 20% 告警、低于 10% 提示及时清理(本页顶部同步横幅提示;请到「数据归档 → 磁盘空间回收」处理)。', fields: [ { name: '文件类型', source: '上传时由业务场景指定或按扩展名推断(大写枚举)。', purpose: '决定存储目录分层,也是查阅时的主要筛选维度', fill: '下拉单选八类之一,留空=全部' }, { name: '业务类型', source: '上传时随附件记录写入(工单/物料/工艺/检验/入库 等)。', purpose: '区分附件挂在哪种业务单据上', fill: '下拉单选,留空=全部' }, @@ -578,9 +579,8 @@ export const helpAttachment = { { name: '上传时间', source: '系统记录上传时刻。', purpose: '按时间区间缩小范围', fill: '可选起止日期,留空=不限' }, { name: '含已删除', source: '勾选后包含逻辑删除的记录。', purpose: '追溯已删除附件', fill: '默认不勾选' }, { name: '大小', source: '系统统计上传达字节数。', purpose: '评估占用空间', fill: '只读' }, - { name: '预览 / 下载', source: '预览走免鉴权直链(PDF/图片浏览器内联打开);下载走鉴权路由并带回中文文件名。', purpose: '查看或另存附件', fill: '点击对应按钮' }, - { name: '删除', source: '行末按钮(权限 sys.attachment:manage,需二次确认)。', purpose: '逻辑删除无效附件(保留可追溯索引)', fill: '点「删除」并确认;无权限时该按钮不显示' }, - { name: '预览 / 下载备用入口', source: '列表行「预览」「下载」按钮。', purpose: '查看或另存附件', fill: '点击对应按钮' } + { name: '预览 / 下载', source: '预览走免鉴权直链(PDF/图片浏览器内联打开);下载走鉴权路由并带回中文文件名。', purpose: '查看或另存附件', fill: '已删除/已清除的附件预览前会先弹前因后果提示;已清除的附件不可下载' }, + { name: '状态', source: '列表列,悬浮显示详情。', purpose: '三态:正常/已删除/已清除', fill: '删除与磁盘释放统一在「数据归档 → 磁盘空间回收」' } ] } diff --git a/bj_power_mes/frontend/src/layouts/MainLayout.vue b/bj_power_mes/frontend/src/layouts/MainLayout.vue index 8e511af..a81935d 100644 --- a/bj_power_mes/frontend/src/layouts/MainLayout.vue +++ b/bj_power_mes/frontend/src/layouts/MainLayout.vue @@ -45,13 +45,6 @@ - - - - - - - 帮助 {{ userName }} ▾ @@ -77,9 +70,9 @@ import { useRouter } from 'vue-router' import { Document, Calendar, Box, Goods, ShoppingCart, Monitor, Tools, Operation, Link, DataLine, Search, CircleCheck, Clock, User, - Key, Fold, Expand, Warning, Paperclip, Tickets, Bell, Setting, Van, AlarmClock + Key, Fold, Expand, Warning, Paperclip, Tickets, Bell, Setting, Van } from '@element-plus/icons-vue' -import { ElNotification, ElMessageBox } from 'element-plus' +import { ElNotification } from 'element-plus' import { getUser, logout } from '../utils/auth' import request from '../utils/request' @@ -209,36 +202,11 @@ onMounted(async () => { // 顶部预警铃铛:立即拉一次未读数,随后每 30s 轮询 pollAlerts() alertTimer = setInterval(pollAlerts, 30000) - - // 数据归档清理提醒:登录后拉取,超期则强提醒(每天一次) - checkArchiveReminder() }) -// ===== 数据归档清理提醒:登录后检查,超期弹强提醒 + 顶栏角标 ===== -// 仅依赖 backup_record 真实数据;localStorage 只记“当天已弹过”,每天最多一次。 -const archiveOverdue = ref(false) +// 说明:数据归档清理提醒已从顶栏角标移除,统一由「预警中心」承载 +// (后端在备份超期时写入 backup_overdue 预警,处理入口为「数据归档」页)。 -async function checkArchiveReminder() { - try { - const r = await request.get('/backup/reminder') - if (!r || !r.overdue) { - archiveOverdue.value = false - return - } - archiveOverdue.value = true - const todayKey = new Date().toISOString().slice(0, 10) - const shown = localStorage.getItem('mes_archive_remind_shown') || '' - if (shown === todayKey) return // 当天已弹过 - localStorage.setItem('mes_archive_remind_shown', todayKey) - ElMessageBox.alert( - `距上次成功备份已超过 ${r.remindDays} 天,建议清理旧数据以释放空间。\n请先在「数据归档」页确认 U 盘备份完整,再手动清理(仅提醒,不自动删除)。`, - '数据归档清理提醒', - { type: 'warning', confirmButtonText: '我知道了', showClose: false } - ).catch(() => {}) - } catch { /* ignore */ } -} - -// ===== 顶部预警铃铛(plan 4.10):未读角标 + 30s 轮询 + 新增弹提示 ===== const unreadAlerts = ref(0) let alertTimer = null let alertInited = false @@ -266,10 +234,6 @@ function goAlertCenter() { router.push('/alert-center') } -function goDataArchive() { - router.push('/data-archive') -} - function doLogout() { // 尽力通知后端记录"退出登录"操作日志,失败不阻塞本地退出 request.post('/logout').catch(() => {}) diff --git a/bj_power_mes/frontend/src/pages/Attachment.vue b/bj_power_mes/frontend/src/pages/Attachment.vue index 1161fde..d53ef5d 100644 --- a/bj_power_mes/frontend/src/pages/Attachment.vue +++ b/bj_power_mes/frontend/src/pages/Attachment.vue @@ -1,8 +1,11 @@