From 0571c03740d9069cf761695d0dcadd4d6bc9af0d Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 19 六月 2025 08:54:19 +0800
Subject: [PATCH] refactor(model): 优化模型相关功能和查询
---
zhitan-vue/src/views/index.vue | 2
zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java | 1
zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue | 11 +++++
zhitan-system/src/main/java/com/zhitan/benchmarkmanage/domain/Benchmark.java | 41 ++++++++++++++++++++
zhitan-vue/src/views/powerquality/load/index.vue | 10 ++++
zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml | 2
zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml | 1
zhitan-vue/src/views/airconditioner/log.vue | 2
8 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/benchmarkmanage/domain/Benchmark.java b/zhitan-system/src/main/java/com/zhitan/benchmarkmanage/domain/Benchmark.java
new file mode 100644
index 0000000..341c52e
--- /dev/null
+++ b/zhitan-system/src/main/java/com/zhitan/benchmarkmanage/domain/Benchmark.java
@@ -0,0 +1,41 @@
+package com.zhitan.benchmarkmanage.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zhitan.common.annotation.Excel;
+import com.zhitan.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 鏍囨潌鍊肩鐞嗗璞� benchmark
+ *
+ * @author ZhiTan
+ */
+@TableName("benchmark")
+@Data
+public class Benchmark extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** uuid涓婚敭 */
+ private String id;
+
+ /** 鏍囨潌缂栫爜 */
+ @Excel(name = "鏍囨潌缂栫爜")
+ private String code;
+
+ /** 鏍囨潌绫诲瀷 */
+ @Excel(name = "鏍囨潌绫诲瀷")
+ private String type;
+
+ /** 鏍囨潌绛夌骇 */
+ @Excel(name = "鏍囨潌绛夌骇")
+ private String grade;
+
+ /** 鏍囨潌鍊� */
+ @Excel(name = "鏍囨潌鍊�")
+ private String value;
+
+ /** 鍥芥爣缂栧彿 */
+ @Excel(name = "鍥芥爣缂栧彿")
+ private String nationalNum;
+
+}
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
index 5cbff37..4f6dbef 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
@@ -137,6 +137,7 @@
List<EnergyIndex> energyIndexList = energyIndexService.getEnergyIndexByIds(indexIds);
// 鏍规嵁indexid鏌ヨ瀵瑰簲璁￠噺鍣ㄥ叿淇℃伅
List<String> meterIds = energyIndexList.stream().map(EnergyIndex::getMeterId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(meterIds)) return voList;
Map<String, List<MeterImplement>> meterImplementMap = meterImplementService.listMeterImplementByIds(meterIds).stream()
.filter(li -> StringUtils.isNotEmpty(li.getInstallactionLocation()))
.collect(Collectors.groupingBy(MeterImplement::getId));
diff --git a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
index 3534519..907d4be 100644
--- a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
@@ -375,6 +375,7 @@
</foreach>
</if>
</where>
+ order by ei.code
</select>
<select id="getiEnergyIndexByCode" resultType="com.zhitan.model.domain.EnergyIndex">
<include refid="selectEnergyIndexVo"/>
diff --git a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
index d8486ec..f325529 100644
--- a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
@@ -309,7 +309,7 @@
ni.index_id indexId
FROM "model_node" mn
LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
- WHERE mn.parent_id = #{parentId}
+ WHERE mn.parent_id = #{parentId} or ni.node_id = #{parentId}
</select>
<select id="getModelNodeIndexIdRelationInforByNodeId"
diff --git a/zhitan-vue/src/views/airconditioner/log.vue b/zhitan-vue/src/views/airconditioner/log.vue
index 5ae9f71..a0a6db4 100644
--- a/zhitan-vue/src/views/airconditioner/log.vue
+++ b/zhitan-vue/src/views/airconditioner/log.vue
@@ -65,7 +65,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔浜哄憳" align="center" prop="operatorName" />
+ <el-table-column label="鎿嶄綔浜哄憳" align="center" prop="createBy" />
</el-table>
<pagination
diff --git a/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue b/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
index 99b33ce..7fcb843 100644
--- a/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
+++ b/zhitan-vue/src/views/costAnalysis/energy-trend-analysis.vue
@@ -8,6 +8,7 @@
import { useRoute } from "vue-router"
const { period } = proxy.useDict("period")
import useSettingsStore from "@/store/modules/settings"
+import message from "yarn/lib/cli.js";
const settingsStore = useSettingsStore()
watch(
() => settingsStore.sideTheme,
@@ -43,7 +44,10 @@
}
})
queryParams.value.meterId = res.data.length > 0 ? res.data[0].code : ""
- getList()
+ if (res.data.length > 0) {
+ getList()
+ }
+
}
})
}
@@ -64,12 +68,17 @@
function getList() {
return
loading.value = true
+
+ if (!queryParams.value.meterId) {
+ message.error("璇烽�夋嫨鐢佃〃")
+ }
let params = {
nodeId: queryParams.value.nodeId,
timeType: queryParams.value.timeType,
timeCode: queryParams.value.dataTime,
meterId: queryParams.value.meterId,
}
+ console.log("params:::",params)
if (queryParams.value.timeType == "DAY") {
params.timeCode = proxy.dayjs(new Date(queryParams.value.dataTime)).format("YYYY-MM-DD")
} else if (queryParams.value.timeType == "MONTH") {
diff --git a/zhitan-vue/src/views/index.vue b/zhitan-vue/src/views/index.vue
index 85e2687..de70046 100644
--- a/zhitan-vue/src/views/index.vue
+++ b/zhitan-vue/src/views/index.vue
@@ -924,7 +924,7 @@
.card-list-item {
width: 0;
flex: 1 1 320px;
- max-width: 320px;
+ max-width: 520px;
height: 135px;
background: rgba(242, 246, 250, 0.1);
box-sizing: border-box;
diff --git a/zhitan-vue/src/views/powerquality/load/index.vue b/zhitan-vue/src/views/powerquality/load/index.vue
index 108cbf6..7525bff 100644
--- a/zhitan-vue/src/views/powerquality/load/index.vue
+++ b/zhitan-vue/src/views/powerquality/load/index.vue
@@ -117,6 +117,7 @@
import { useRoute } from "vue-router"
const { period } = proxy.useDict("period")
import useSettingsStore from "@/store/modules/settings"
+import {ElMessage} from "element-plus";
const settingsStore = useSettingsStore()
watch(
() => settingsStore.sideTheme,
@@ -151,7 +152,9 @@
}
})
queryParams.value.meterId = res.data.length > 0 ? res.data[0].code : ""
- getList()
+ if (res.data.length > 0) {
+ getList()
+ }
}
})
}
@@ -178,7 +181,12 @@
const LineChartRef = ref()
function getList() {
+ if (!queryParams.value.meterId) {
+ ElMessage.error("璇烽�夋嫨鐢佃〃")
+ return
+ }
loading.value = true
+
let params = {
nodeId: queryParams.value.nodeId,
timeType: queryParams.value.timeType,
--
Gitblit v1.9.3