lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java
@@ -8,6 +8,7 @@ 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; @@ -170,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"); @@ -185,7 +186,7 @@ items.add(item); } return Result.OK(items); }catch (Exception e) { } catch (Exception e) { return Result.error("æ°æ®è½¬è¯å¤±è´¥ï¼"); } } @@ -198,22 +199,51 @@ LocalDate start = today.minusDays(30); //åªåå7å List<RepairmanRankingVO> list = repairOrderService.repairmanRanking(start.toString(), end.toString()); if(CollectionUtil.isEmpty(list)) { if (CollectionUtil.isEmpty(list)) { return Result.ok(Collections.emptyList()); } if(list.size() > 7) { if (list.size() > 7) { list = list.subList(0, 7); } List<JSONObject> items = new ArrayList<>(); try { for(RepairmanRankingVO vo : list) { 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) { } 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("æ°æ®è½¬è¯å¤±è´¥ï¼"); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java
@@ -9,6 +9,7 @@ import org.jeecg.modules.eam.vo.EquipmentRepairListVO; import org.jeecg.modules.eam.vo.EquipmentRepairStatistics; import org.jeecg.modules.eam.vo.EquipmentRepairStatusStatistics; import org.jeecg.modules.eam.vo.FaultTypeStatisticsVO; import java.util.List; @@ -49,4 +50,12 @@ * @return */ List<EquipmentRepairListVO> repairList(); /** * 骨æåç±»ç»è®¡ * @param start * @param end * @return */ List<FaultTypeStatisticsVO> faultTypeStatistics(String start, String end); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
@@ -96,4 +96,13 @@ and err.del_flag = 0 order by e.org_id, err.fault_start_time </select> <select id="faultTypeStatistics" resultType="org.jeecg.modules.eam.vo.FaultTypeStatisticsVO"> select t.fault_type, count(1) as faultCount from eam_report_repair t where t.report_status != 'ABOLISH' and t.del_flag = 0 and t.create_time >= #{start} and t.create_time < #{end} group by t.fault_type </select> </mapper> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
@@ -10,6 +10,7 @@ import org.jeecg.modules.eam.vo.EquipmentRepairListVO; import org.jeecg.modules.eam.vo.EquipmentRepairStatistics; import org.jeecg.modules.eam.vo.EquipmentRepairStatusStatistics; import org.jeecg.modules.eam.vo.FaultTypeStatisticsVO; import java.time.LocalDate; import java.util.List; @@ -78,4 +79,12 @@ * @return */ List<EquipmentRepairListVO> repairList(); /** * æ éåç±»ç»è®¡ * @param start * @param end * @return */ List<FaultTypeStatisticsVO> faultTypeStatistics(String start, String end); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -22,6 +22,7 @@ import org.jeecg.modules.eam.vo.EquipmentRepairListVO; import org.jeecg.modules.eam.vo.EquipmentRepairStatistics; import org.jeecg.modules.eam.vo.EquipmentRepairStatusStatistics; import org.jeecg.modules.eam.vo.FaultTypeStatisticsVO; import org.jeecg.modules.system.service.IMdcProductionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -202,4 +203,9 @@ public List<EquipmentRepairListVO> repairList() { return this.baseMapper.repairList(); } @Override public List<FaultTypeStatisticsVO> faultTypeStatistics(String start, String end) { return this.baseMapper.faultTypeStatistics(start, end); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/FaultTypeStatisticsVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ package org.jeecg.modules.eam.vo; import lombok.Data; @Data public class FaultTypeStatisticsVO { /** * æ éç±»å */ private String faultType; /** * æ éç»è®¡ä¸ªæ° */ private Integer faultCount; }