Bladeren bron

报表接口

lipenghui 1 week geleden
bovenliggende
commit
b06938491b

+ 14 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotReportController.java

@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.pms.controller.admin.stat;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "报表接口")
+@RestController
+@RequestMapping("/rq/report")
+@Validated
+public class IotReportController {
+
+}

+ 2 - 3
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -559,9 +559,8 @@ public class IotStaticController {
             List<Map.Entry<Long, Long>> collect = iotDeviceDOS.stream().collect(Collectors.groupingBy(IotDeviceDO::getAssetClass, Collectors.counting())).entrySet().stream().sorted(Map.Entry.<Long, Long>comparingByValue().reversed()).collect(Collectors.toList());
             collect.forEach(e->{
                 IotProductClassifyDO iotProductClassifyDO = iotProductClassifyMapper.selectById(e.getKey());
-                if ("电驱增压机".equals(iotProductClassifyDO.getName())||"柴驱增压机".equals(iotProductClassifyDO.getName())||"电驱空压机".equals(iotProductClassifyDO.getName())||"柴驱空压机".equals(iotProductClassifyDO.getName())
-                        ||"空气处理撬".equals(iotProductClassifyDO.getName())||"提纯撬".equals(iotProductClassifyDO.getName()) ||"膜组".equals(iotProductClassifyDO.getName())||"注水泵".equals(iotProductClassifyDO.getName())
-                        ||"箱变".equals(iotProductClassifyDO.getName())) {
+                if ("电驱增压机".equals(iotProductClassifyDO.getName())||"柴驱增压机".equals(iotProductClassifyDO.getName())||"液驱增压机".equals(iotProductClassifyDO.getName())||"电驱空压机".equals(iotProductClassifyDO.getName())||"柴驱空压机".equals(iotProductClassifyDO.getName())
+                        ||"空气处理撬".equals(iotProductClassifyDO.getName())||"提纯撬".equals(iotProductClassifyDO.getName()) ||"膜组".equals(iotProductClassifyDO.getName())||"注水泵".equals(iotProductClassifyDO.getName())) {
                     Map<String, Object> map = new HashMap<>(4);
                     map.put("category", iotProductClassifyDO.getName());
                     map.put("value", e.getValue());