From c8a4330f3b2ac074d6ebbbbd21c483ded9b3e377 Mon Sep 17 00:00:00 2001
From: wangkai <10903508@qq.com>
Date: Sat, 24 Oct 2026 15:13:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(line):=20=E6=99=BA=E7=94=B5=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0=E7=BA=BF=E8=B7=AF=E5=8F=B0=E8=B4=A6=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=8C=E7=BA=BF=E8=B7=AF=E6=95=B0=E6=8D=AE=E3=80=8D=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=B1=95=E7=A4=BA=E6=9C=80=E8=BF=91=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=87=8F=E5=BF=AB=E7=85=A7=20-=20=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9EGET=20/api/electricity-data/latest?=
 =?UTF-8?q?=EF=BC=88=E6=8C=89lineId=E5=8F=96=E6=9C=80=E5=A4=A7collect=5Fti?=
 =?UTF-8?q?me=E7=9A=84=E5=85=A8=E9=83=A8=E6=A8=A1=E6=8B=9F=E9=87=8F?=
 =?UTF-8?q?=E8=A1=8C=EF=BC=8CRBAC=20device:list=EF=BC=89=EF=BC=9B=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AFelectricityDataApi.getLatestByLine=E4=B8=8EElectricity?=
 =?UTF-8?q?LatestSnapshot=E7=B1=BB=E5=9E=8B=EF=BC=9B=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=E9=A1=B5=E8=A1=A8=E6=A0=BC=E6=96=B0=E5=A2=9E=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E3=80=8C=E6=93=8D=E4=BD=9C=E3=80=8D=E5=88=97?=
 =?UTF-8?q?=E4=B8=8E=E3=80=8C=E7=BA=BF=E8=B7=AF=E6=95=B0=E6=8D=AE=E3=80=8D?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?720px=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=88=E7=BA=BF=E8=B7=AF/=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81/=E9=87=87=E9=9B=86=E6=97=B6=E9=97=B4=EF=BC=89?=
 =?UTF-8?q?=E5=8F=8A=E6=A8=A1=E6=8B=9F=E9=87=8F=E8=A1=A8=E6=A0=BC=EF=BC=88?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E9=87=8F=E5=90=8D=E7=A7=B0/=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B/=E6=95=B0=E5=80=BC/=E5=8D=95=E4=BD=8D=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=80=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 noreply@anthropic.com
---
 client/src/api/device.ts                      | 25 ++++++
 client/src/views/device/line/index.vue        | 88 ++++++++++++++++++-
 .../controller/electricity_data.controller.ts | 42 ++++++++-
 3 files changed, 153 insertions(+), 2 deletions(-)

diff --git a/client/src/api/device.ts b/client/src/api/device.ts
index 21a2c0f..d8a1552 100644
--- a/client/src/api/device.ts
+++ b/client/src/api/device.ts
@@ -272,4 +272,29 @@ export const electricGatewayApi = {
 
 	sync: () =>
 		request.post<IccGatewaySyncResult>('/electric-gateways/sync'),
+};
+
+// ==================== 线路用电（ICC 模拟量） ====================
+
+export interface ElectricityAnalogRow {
+	analogType?: string;
+	analogName?: string;
+	analogUnit?: string;
+	analogValue?: number | string | null;
+}
+
+export interface ElectricityLatestSnapshot {
+	lineId: number;
+	lineCode?: string;
+	lineName?: string;
+	imei?: string;
+	customerId?: number;
+	collectTime?: string | null;
+	hasData: boolean;
+	list: ElectricityAnalogRow[];
+}
+
+export const electricityDataApi = {
+	getLatestByLine: (lineId: number) =>
+		request.get<ElectricityLatestSnapshot>('/electricity-data/latest', { params: { lineId } }),
 };
\ No newline at end of file
diff --git a/client/src/views/device/line/index.vue b/client/src/views/device/line/index.vue
index 4ed5b50..155e212 100644
--- a/client/src/views/device/line/index.vue
+++ b/client/src/views/device/line/index.vue
@@ -140,6 +140,11 @@
 							<template v-else-if="column.key === 'syncedAt'">
 								<span>{{ formatTime(record.syncedAt) }}</span>
 							</template>
+							<template v-else-if="column.key === 'action'">
+								<a-button type="link" size="small" @click="handleViewData(record)">
+									线路数据
+								</a-button>
+							</template>
 						</template>
 
 						<template #emptyText>
@@ -149,9 +154,31 @@
 				</div>
 			</div>
 		</div>
+	<a-modal
+		v-model:open="analogModal.open"
+		:title="analogModal.title"
+		:width="720"
+		:footer="null"
+	>
+		<div v-if="analogModal.loading" class="modal-tip">加载中...</div>
+		<div v-else-if="!analogModal.snapshot || !analogModal.snapshot.hasData" class="modal-tip">暂无模拟量数据，可点击「同步线路」或等待定时同步后查看</div>
+		<template v-else>
+			<div class="modal-meta">
+				<span>线路：{{ analogModal.snapshot.lineName || '-' }}</span>
+				<span>编码：{{ analogModal.snapshot.lineCode || '-' }}</span>
+				<span>采集时间：{{ formatTime(analogModal.snapshot.collectTime) }}</span>
+			</div>
+			<a-table
+				:columns="analogColumns"
+				:data-source="analogModal.snapshot.list"
+				:pagination="false"
+				row-key="analogType"
+				size="small"
+			/>
+		</template>
+	</a-modal>
 	</div>
 </template>
-
 <script setup lang="ts">
 import { ref, reactive, onMounted, computed } from 'vue';
 import { message } from 'ant-design-vue';
@@ -162,8 +189,10 @@ import {
 } from '@ant-design/icons-vue';
 import {
 	electricLineApi,
+	electricityDataApi,
 	type ElectricLine,
 	type ElectricLineQuery,
+	type ElectricityLatestSnapshot,
 } from '@/api/device';
 import { customerApi, type CustomerInfo } from '@/api/customer';
 import { useTableScroll } from '@/composables/useTableScroll';
@@ -172,6 +201,25 @@ const { wrapperRef, tableHeight } = useTableScroll();
 
 const loading = ref(false);
 const syncing = ref(false);
+	const analogModal = reactive<{
+		open: boolean;
+		loading: boolean;
+		title: string;
+		snapshot: ElectricityLatestSnapshot | null;
+	}>({
+		open: false,
+		loading: false,
+		title: '线路模拟数据',
+		snapshot: null,
+	});
+	
+	const analogColumns = [
+		{ title: '模拟量名称', dataIndex: 'analogName', key: 'analogName', ellipsis: true },
+		{ title: '类型', dataIndex: 'analogType', key: 'analogType', ellipsis: true, width: 100 },
+		{ title: '数值', dataIndex: 'analogValue', key: 'analogValue', align: 'center' as const, width: 120 },
+		{ title: '单位', dataIndex: 'analogUnit', key: 'analogUnit', align: 'center' as const, width: 80 },
+	];
+	
 const dataSource = ref<ElectricLine[]>([]);
 const total = ref(0);
 
@@ -197,6 +245,7 @@ const columns = [
 	{ title: '生产日期', dataIndex: 'produceDate', key: 'produceDate', ellipsis: true, width: 120 },
 	{ title: '状态', dataIndex: 'status', key: 'status', align: 'center' as const, width: 80 },
 	{ title: '同步时间', dataIndex: 'syncedAt', key: 'syncedAt', ellipsis: true, width: 170 },
+	{ title: '操作', key: 'action', align: 'center' as const, fixed: 'right' as const, width: 100 },
 ];
 
 const pagination = computed(() => ({
@@ -280,6 +329,25 @@ async function handleSync() {
 	}
 }
 
+	async function handleViewData(record: ElectricLine) {
+		analogModal.open = true;
+		analogModal.loading = true;
+		analogModal.title = `线路数据 - ${record.lineName || record.lineCode}`;
+		analogModal.snapshot = null;
+		try {
+			const res: any = await electricityDataApi.getLatestByLine(record.id);
+			if (res.code === 200) {
+				analogModal.snapshot = res.data;
+			} else {
+				message.error(res.message || '获取模拟数据失败');
+			}
+		} catch (error) {
+			message.error('获取模拟数据失败，请稍后重试');
+		} finally {
+			analogModal.loading = false;
+		}
+	}
+	
 function formatTime(val?: string) {
 	if (!val) return '-';
 	const d = new Date(val);
@@ -517,4 +585,22 @@ function formatTime(val?: string) {
 	background: #136bfb;
 	border-color: #136bfb;
 }
+	.modal-meta {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 8px 24px;
+		font-size: 13px;
+		color: #5b6b7e;
+		margin-bottom: 12px;
+	}
+	.modal-meta span {
+		font-weight: 600;
+		color: #0d1c2c;
+	}
+	.modal-tip {
+		padding: 40px 0;
+		text-align: center;
+		color: #5b6b7e;
+	}
+	
 </style>
diff --git a/server/src/controller/electricity_data.controller.ts b/server/src/controller/electricity_data.controller.ts
index 46d010d..485469c 100644
--- a/server/src/controller/electricity_data.controller.ts
+++ b/server/src/controller/electricity_data.controller.ts
@@ -1,14 +1,54 @@
-import { Controller, Post, Inject } from "@midwayjs/core";
+import { Controller, Post, Get, Query, Inject } from "@midwayjs/core";
 import { Context } from "@midwayjs/koa";
+import { InjectRepository } from "@midwayjs/sequelize";
+import { Repository } from "sequelize-typescript";
 import { IccAnalogSyncService } from "../service/icc_analog_sync.service";
+import ElectricityData from "../entity/electricity_data.entity";
 
 @Controller("/api/electricity-data")
 export class ElectricityDataController {
 	@Inject() ctx!: Context;
 	@Inject() iccAnalogSyncService!: IccAnalogSyncService;
+	@InjectRepository(ElectricityData)
+	electricityDataRepo!: Repository<ElectricityData>;
 
 	@Post("/sync") async sync() {
 		const result = await this.iccAnalogSyncService.syncFromIcc(this.ctx);
 		return { code: 200, message: "模拟量数据同步完成", data: result };
 	}
+
+	/** 查询某线路最近一次同步的模拟量快照（取最大 collect_time 的全部模拟量行） */
+	@Get("/latest") async latest(@Query("lineId") lineId?: string) {
+		const id = Number(lineId);
+		if (!id || Number.isNaN(id)) {
+			return { code: 400, message: "缺少有效的 lineId 参数" };
+		}
+		const latest = await this.electricityDataRepo.findOne({
+			where: { lineId: id },
+			order: [["collectTime", "DESC"]],
+			attributes: ["lineCode", "lineName", "imei", "customerId", "collectTime"],
+		});
+		if (!latest) {
+			return { code: 200, message: "该线路暂无模拟量数据", data: { lineId: id, hasData: false, collectTime: null, list: [] } };
+		}
+		const rows = await this.electricityDataRepo.findAll({
+			where: { lineId: id, collectTime: latest.getDataValue("collectTime") as Date },
+			order: [["analogType", "ASC"]],
+			attributes: ["analogType", "analogName", "analogUnit", "analogValue"],
+		});
+		return {
+			code: 200,
+			message: "ok",
+			data: {
+				lineId: id,
+				lineCode: latest.getDataValue("lineCode"),
+				lineName: latest.getDataValue("lineName"),
+				imei: latest.getDataValue("imei"),
+				customerId: latest.getDataValue("customerId"),
+				collectTime: latest.getDataValue("collectTime"),
+				hasData: true,
+				list: rows,
+			},
+		};
+	}
 }