增加cpu温度处理

tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java

@@ -112,4 +112,12 @@ public class InitialCpuInfoController extends BaseController
         Map<String, Object> echartsData = initialCpuInfoService.cpuTimeEcharts(initialCpuInfo);
         return success(echartsData);
     }
+    /**
+     * 查询CPU温度信息并封装为多折线ECharts图表数据
+     */
+    @PostMapping("/cupTemperatureEcharts")
+    public AjaxResult cupTemperatureEcharts(@RequestBody InitialCpuInfo initialCpuInfo) {
+        Map<String, Object> echartsData = initialCpuInfoService.cupTemperatureEcharts(initialCpuInfo);
+        return success(echartsData);
+    }
 }

tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/AllDiskName.java

@@ -29,6 +29,9 @@ public class AllDiskName extends BaseEntity
     /** 磁盘状态(0:丢失,1:存在) */
     @Excel(name = "磁盘状态(0:丢失,1:存在)")
     private Integer status;
+    /** 执行卸载(0未执行，1已执行） */
+    @Excel(name = "执行卸载(0未执行，1已执行）")
+    private Integer umountFlag;
 
     /** 读取IOPS */
     @Excel(name = "读取IOPS")

tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialCpuInfo.java

@@ -72,6 +72,8 @@ public class InitialCpuInfo extends BaseEntity
     /** CPU用户进程所花费的时间(秒) */
     @Excel(name = "CPU用户进程所花费的时间")
     private Long user;
+    /** cpu温度 */
+    private Long temperature;
     /** 开始时间 */
     private String startTime;
     /** 结束时间 */

tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/MessageHandler.java

@@ -549,6 +549,9 @@ public class MessageHandler {
             cpus.forEach(iface -> {
                 iface.setClientId(message.getClientId());
                 iface.setCreateTime(createTime);
+                if(iface.getTemperature() == 0L){
+                    iface.setTemperature(null);
+                }
             });
             // 初始CPU数据入库
             initialCpuInfoService.batchInsertInitialCpuInfo(cpus);

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialCpuInfoService.java

@@ -71,4 +71,11 @@ public interface IInitialCpuInfoService
     Map<String, Object> cupLoadEcharts(InitialCpuInfo initialCpuInfo);
 
     Map<String, Object> cpuTimeEcharts(InitialCpuInfo initialCpuInfo);
+
+    /**
+     * cpu温度
+     * @param initialCpuInfo
+     * @return
+     */
+    Map<String, Object> cupTemperatureEcharts(InitialCpuInfo initialCpuInfo);
 }

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/AllDiskNameServiceImpl.java

@@ -137,6 +137,10 @@ public class AllDiskNameServiceImpl implements IAllDiskNameService
         if(processType == 1){
             policyTypeVo.setDiskIopsTest(allDiskName.getName());
         }else if(processType ==2){
+            AllDiskName updateDisk = new AllDiskName();
+            updateDisk.setId(id);
+            updateDisk.setUmountFlag(1);
+            allDiskNameMapper.updateAllDiskName(updateDisk);
             policyTypeVo.setUmountDisk(allDiskName.getName());
         }
         MessageProducer messageProducer = new MessageProducer();

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialCpuInfoServiceImpl.java

@@ -160,5 +160,20 @@ public class InitialCpuInfoServiceImpl implements IInitialCpuInfoService
 
         return EchartsDataUtils.buildEchartsData(list,InitialCpuInfo::getCreateTime, extractors);
     }
+    /**
+     * cpu负载
+     * @param initialCpuInfo
+     * @return
+     */
+    @Override
+    public Map<String, Object> cupTemperatureEcharts(InitialCpuInfo initialCpuInfo) {
+        // 查询原始CPU监控数据并按时间排序
+        List<InitialCpuInfo> list = initialCpuInfoMapper.selectInitialCpuInfoList(initialCpuInfo);
+
+        Map<String, Function<InitialCpuInfo, ?>> extractors = new LinkedHashMap<>();
+        extractors.put("temperatureData", InitialCpuInfo::getTemperature);
+
+        return EchartsDataUtils.buildEchartsDataAutoPadding(list, InitialCpuInfo::getCreateTime, extractors, initialCpuInfo.getStartTime(), initialCpuInfo.getEndTime());
+    }
 
 }

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialDiskInfoServiceImpl.java

@@ -253,7 +253,7 @@ public class InitialDiskInfoServiceImpl implements IInitialDiskInfoService
     public Map<String, Object> usedSpaceEcharts(InitialDiskInfo initialDiskInfo) {
         initialDiskInfo.setType("HDD");
         List<InitialDiskInfo> list = getDistInfoSharding(initialDiskInfo);
-        String unit = "KB";
+        String unit = "Kb";
         if(list != null && !list.isEmpty()){
             Long totalUsedSpace = 0L;
             for (InitialDiskInfo diskInfo : list) {