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 | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 164 insertions(+), 4 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 109ffa9..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 @@ -1,23 +1,28 @@ package org.jeecg.modules.eam.controller; +import cn.hutool.core.collection.CollectionUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; +import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; 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.IEamReportRepairService; -import org.jeecg.modules.eam.vo.EquipmentRepairStatistics; -import org.jeecg.modules.eam.vo.EquipmentStatusStatistics; +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; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.time.LocalDate; import java.util.*; @@ -30,6 +35,17 @@ private IEamEquipmentService eamEquipmentService; @Autowired private IEamReportRepairService reportRepairService; + @Autowired + private IEamInspectionOrderService inspectionOrderService; + @Autowired + private IEamWeekMaintenanceOrderService weekMaintenanceOrderService; + @Resource + private ObjectMapper objectMapper; + @Resource + private TranslateDictTextUtils translateDictTextUtils; + @Autowired + private IEamRepairOrderService repairOrderService; + @ApiOperation(value = "鐪嬫澘鎺ュ彛-缁翠繚鐘舵�佺粺璁�", notes = "鐪嬫澘鎺ュ彛-缁翠繚鐘舵�佺粺璁�") @GetMapping(value = "/equipmentStatusStatistics") @@ -87,4 +103,148 @@ resultList.sort(Comparator.comparing(EquipmentRepairStatistics::getMonthStr)); return Result.ok(resultList); } + + @ApiOperation(value = "鐪嬫澘鎺ュ彛-鐐规缁熻", notes = "鐪嬫澘鎺ュ彛-鐐规缁熻") + @GetMapping(value = "/equipmentInspectionStatistics") + public Result<?> equipmentInspectionStatistics(@RequestParam(required = false, value = "productionId") String productionId) { + //缁熻缁撴潫鏃ユ湡 + LocalDate today = LocalDate.now(); + LocalDate localDate = today.minusMonths(5); + //缁熻寮�濮嬫棩鏈� + LocalDate firstOfMonth = DateUtils.getFirstOfMonth(localDate); + + //鍒濆鍖栬繑鍥炲�� + Map<String, EquipmentInspectionStatistics> statisticsMap = new HashMap<>(); + List<String> monthsBetween = DateUtils.getMonthsBetween(firstOfMonth, today); + monthsBetween.forEach(month -> { + statisticsMap.put(month, new EquipmentInspectionStatistics(month)); + }); + + List<EquipmentInspectionStatistics> list = inspectionOrderService.equipmentInspectionStatistics(productionId, firstOfMonth, today); + for (EquipmentInspectionStatistics statistics : list) { + if (statisticsMap.containsKey(statistics.getMonthStr())) { + statisticsMap.put(statistics.getMonthStr(), statistics); + } + } + List<EquipmentInspectionStatistics> resultList = new ArrayList<>(statisticsMap.values()); + //鎺掑簭 + resultList.sort(Comparator.comparing(EquipmentInspectionStatistics::getMonthStr)); + return Result.ok(resultList); + } + + @ApiOperation(value = "鐪嬫澘鎺ュ彛-鍛ㄤ繚缁熻", notes = "鐪嬫澘鎺ュ彛-鍛ㄤ繚缁熻") + @GetMapping(value = "/equipmentMaintenanceStatistics") + public Result<?> equipmentMaintenanceStatistics(@RequestParam(required = false, value = "productionId") String productionId) { + //缁熻缁撴潫鏃ユ湡 + LocalDate today = LocalDate.now(); + LocalDate localDate = today.minusMonths(5); + //缁熻寮�濮嬫棩鏈� + LocalDate firstOfMonth = DateUtils.getFirstOfMonth(localDate); + + //鍒濆鍖栬繑鍥炲�� + Map<String, EquipmentMaintenanceStatistics> statisticsMap = new HashMap<>(); + List<String> monthsBetween = DateUtils.getMonthsBetween(firstOfMonth, today); + monthsBetween.forEach(month -> { + statisticsMap.put(month, new EquipmentMaintenanceStatistics(month)); + }); + + List<EquipmentMaintenanceStatistics> list = weekMaintenanceOrderService.equipmentMaintenanceStatistics(productionId, firstOfMonth, today); + for (EquipmentMaintenanceStatistics statistics : list) { + if (statisticsMap.containsKey(statistics.getMonthStr())) { + statisticsMap.put(statistics.getMonthStr(), statistics); + } + } + List<EquipmentMaintenanceStatistics> resultList = new ArrayList<>(statisticsMap.values()); + //鎺掑簭 + resultList.sort(Comparator.comparing(EquipmentMaintenanceStatistics::getMonthStr)); + return Result.ok(resultList); + } + + @ApiOperation(value = "缁翠慨鐪嬫澘-缁翠慨鐘舵�佺粺璁�", notes = "缁翠慨鐪嬫澘-缁翠慨鐘舵�佺粺璁�") + @GetMapping(value = "/repairStatusStatistics") + public Result<?> repairStatusStatistics() { + EquipmentRepairStatusStatistics statistics = reportRepairService.repairStatusStatistics(); + return Result.OK(statistics); + } + + @ApiOperation(value = "缁翠慨鐪嬫澘-缁翠慨鍒楄〃", notes = "缁翠慨鐪嬫澘-缁翠慨鍒楄〃") + @GetMapping(value = "/repairList") + public Result<?> repairList() { + List<EquipmentRepairListVO> list = reportRepairService.repairList(); + if (CollectionUtil.isEmpty(list)) { + return Result.ok(Collections.emptyList()); + } + List<JSONObject> items = new ArrayList<>(); + try { + 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"); + translateDictTextUtils.translateField("repairOperator", vo.getRepairOperator(), item, "sys_user,realname,username"); + translateDictTextUtils.translateField("reportStatus", vo.getReportStatus(), item, "report_repair_status"); + translateDictTextUtils.translateField("orgId", vo.getOrgId(), item, "mdc_production,production_name,id"); + items.add(item); + } + return Result.OK(items); + } catch (Exception e) { + return Result.error("鏁版嵁杞瘧澶辫触锛�"); + } + } + + @ApiOperation(value = "缁翠慨鐪嬫澘-缁翠慨宸ユ帓鍚�", notes = "缁翠慨鐪嬫澘-缁翠慨宸ユ帓鍚�") + @GetMapping(value = "/repairmanRanking") + public Result<?> repairmanRanking() { + 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