From 140248961e5f865d48e850f8d6b10e3338171283 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 09 五月 2025 13:19:19 +0800
Subject: [PATCH] art: 设备管理-维修看板-故障分类统计
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java
index 20a427c..8e4a1b1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java
@@ -8,15 +8,13 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.EquipmentRepairStatus;
import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
-import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -43,9 +41,11 @@
private IEamWeekMaintenanceOrderService weekMaintenanceOrderService;
@Resource
private ObjectMapper objectMapper;
-
@Resource
private TranslateDictTextUtils translateDictTextUtils;
+ @Autowired
+ private IEamRepairOrderService repairOrderService;
+
@ApiOperation(value = "鐪嬫澘鎺ュ彛-缁翠繚鐘舵�佺粺璁�", notes = "鐪嬫澘鎺ュ彛-缁翠繚鐘舵�佺粺璁�")
@GetMapping(value = "/equipmentStatusStatistics")
@@ -171,12 +171,12 @@
@GetMapping(value = "/repairList")
public Result<?> repairList() {
List<EquipmentRepairListVO> list = reportRepairService.repairList();
- if(CollectionUtil.isEmpty(list)) {
+ if (CollectionUtil.isEmpty(list)) {
return Result.ok(Collections.emptyList());
}
List<JSONObject> items = new ArrayList<>();
try {
- for(EquipmentRepairListVO vo : list) {
+ for (EquipmentRepairListVO vo : list) {
String json = objectMapper.writeValueAsString(vo);
JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
translateDictTextUtils.translateField("reportOperator", vo.getReportOperator(), item, "sys_user,realname,username");
@@ -186,7 +186,7 @@
items.add(item);
}
return Result.OK(items);
- }catch (Exception e) {
+ } catch (Exception e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
}
}
@@ -194,6 +194,57 @@
@ApiOperation(value = "缁翠慨鐪嬫澘-缁翠慨宸ユ帓鍚�", notes = "缁翠慨鐪嬫澘-缁翠慨宸ユ帓鍚�")
@GetMapping(value = "/repairmanRanking")
public Result<?> repairmanRanking() {
- return null;
+ LocalDate today = LocalDate.now();
+ LocalDate end = today.plusDays(1);
+ LocalDate start = today.minusDays(30);
+ //鍙彇鍓�7鍚�
+ List<RepairmanRankingVO> list = repairOrderService.repairmanRanking(start.toString(), end.toString());
+ if (CollectionUtil.isEmpty(list)) {
+ return Result.ok(Collections.emptyList());
+ }
+ if (list.size() > 7) {
+ list = list.subList(0, 7);
+ }
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for (RepairmanRankingVO vo : list) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("repairer", vo.getRepairer(), item, "sys_user,realname,username");
+ items.add(item);
+ }
+ return Result.OK(items);
+ } catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
+
+ @ApiOperation(value = "缁翠慨鐪嬫澘-鏁呴殰绫诲瀷缁熻", notes = "缁翠慨鐪嬫澘-鏁呴殰绫诲瀷缁熻")
+ @GetMapping(value = "/faultTypeStatistics")
+ public Result<?> faultTypeStatistics() {
+ //缁熻浠婂勾鏉ユ晠闅滃垎绫绘儏鍐�
+ LocalDate today = LocalDate.now();
+ LocalDate end = today.plusDays(1);
+ //浠婂勾绗竴澶�
+ LocalDate start = today.withDayOfYear(1);
+ // 缁熻涓暟
+ List<FaultTypeStatisticsVO> list = reportRepairService.faultTypeStatistics(start.toString(), end.toString());
+ if (CollectionUtil.isEmpty(list)) {
+ return Result.ok(Collections.emptyList());
+ }
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for (FaultTypeStatisticsVO vo : list) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("faultType", vo.getFaultType(), item, "fault_reason_category");
+ if (item.get("faultType" + CommonConstant.DICT_TEXT_SUFFIX) != null) {
+ items.add(item);
+ }
+ }
+ return Result.OK(items);
+ } catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
}
--
Gitblit v1.9.3