From 63b5f0ca37c2f9ca3ab2867cc91f9adcf9901857 Mon Sep 17 00:00:00 2001
From: "Mr.Wang" <wang@qq.com>
Date: Mon, 27 May 2024 11:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=AC=A1=E6=95=B0=E6=A0=B9=E6=8D=AE=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=88=86=E7=BB=84=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/DcOperLogServiceImpl.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java
index f01fa195..f25bc494 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcOperLogServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.PageUtils;
 import com.zc.business.domain.*;
+import com.zc.business.enums.DeviceTypeEnum;
 import com.zc.business.mapper.DcOperLogMapper;
 import com.zc.business.service.*;
 import org.springframework.stereotype.Service;
@@ -56,7 +57,16 @@ public class DcOperLogServiceImpl extends ServiceImpl<DcOperLogMapper, DcOperLog
         queryWrapper.select("COUNT(dc_device_type) as deviceCount", "dc_device_type")
                 .ne("dc_device_type", "")
                 .groupBy("dc_device_type");
-        return listMaps(queryWrapper);
+        List<Map<String, Object>> list = listMaps(queryWrapper);
+        list.forEach(map -> {
+            String typeName = Arrays.stream(DeviceTypeEnum.values())
+                    .filter(deviceTypeEnum -> deviceTypeEnum.getCode() == Integer.parseInt(map.get("dc_device_type").toString()))
+                    .findFirst()
+                    .map(DeviceTypeEnum::getInfo)
+                    .orElse("其他");
+            map.put("typeName",typeName);
+        });
+        return list;
     }
 
     private static LambdaQueryWrapper<DcOperLog> getDcOperLogLambdaQueryWrapper(DcOperLog dcOperLog, Date endTime, Date startTime) {