From 7ad896ca241f8172386d65629de0d4409ebaec4e Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Fri, 1 Nov 2024 14:30:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E5=92=8C=E8=BD=B4=E6=89=BF=E7=8A=B6=E6=80=81=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/controller/equip/vo/EquipInfoRespVO.java     | 2 ++
 .../inspur/module/system/dal/mysql/equip/EquipInfoMapper.java  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java
index 060750b..dfc835b 100644
--- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java
+++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoRespVO.java
@@ -71,4 +71,6 @@ public class EquipInfoRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
+    @Schema(description = "运行状态")
+    private Integer runStatus;
 }
\ No newline at end of file
diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
index b5ab429..3681afa 100644
--- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
+++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java
@@ -29,7 +29,8 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
                 .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId())
                 .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
                 .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
-                .orderByDesc(EquipInfoDO::getCreateTime));
+                .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
+        );
     }
 
     default List<EquipSelectionVO> selection(){

From 16e282a20a1afdfbe01c4116ae4c4d3ee5ced151 Mon Sep 17 00:00:00 2001
From: zhangjunwen <zhangjunwen@inspur.com>
Date: Fri, 1 Nov 2024 14:43:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9F=A5=E8=AF=A2=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E5=92=8C=E8=BD=B4=E6=89=BF=E7=8A=B6=E6=80=81=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/alarm/equiptrendalarm/index.vue    | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue b/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue
index 37bb722..bb95e75 100644
--- a/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue
+++ b/imt-ui/src/views/system/alarm/equiptrendalarm/index.vue
@@ -164,17 +164,22 @@
         align="center"
         prop="modelName"
       />
+      <el-table-column
+        label="机床名称"
+        align="center"
+        prop="equipName"
+      />
       <el-table-column
         label="机床编号"
         align="center"
         prop="equipNo"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="机床组件"
         align="center"
         prop="componentName"
-      />
-      <el-table-column
+      /> -->
+      <!-- <el-table-column
         label="报警等级"
         align="center"
         prop="alarmLevel"
@@ -185,8 +190,8 @@
             :value="scope.row.alarmLevel"
           />
         </template>
-      </el-table-column>
-      <el-table-column
+      </el-table-column> -->
+      <!-- <el-table-column
         label="首次报警时间"
         align="center"
         prop="firstAlarmTime"
@@ -205,7 +210,7 @@
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.latestAlarmTime) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column
         label="状态"
         align="center"
@@ -219,14 +224,14 @@
         </template>
       </el-table-column> -->
       <el-table-column
-        label="状态"
+        label="轴承状态"
         align="center"
-        prop="equipAnalyseStatus"
+        prop="status"
       >
         <template v-slot="scope">
           <dict-tag
             :type="DICT_TYPE.TREND_ANALY_STATUS"
-            :value="scope.row.equipAnalyseStatus"
+            :value="scope.row.status"
           />
         </template>
       </el-table-column>
@@ -279,6 +284,7 @@
   <script>
 import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
 import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
+import * as EquipInfoApi from "@/api/system/equip/equipInfo";
 import {
   getEquipCascader,
   getEquipSelection,
@@ -339,9 +345,10 @@ export default {
     async getList() {
       try {
         this.loading = true;
-        const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
-          this.queryParams
-        );
+        // const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
+        //   this.queryParams
+        // );
+        const res = await EquipInfoApi.getEquipInfoPage(this.queryParams);
         await getEquipCascader().then((res) => {
           res.forEach((item) => {
             if (item.children == null) {