From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 07 三月 2025 16:16:18 +0800 Subject: [PATCH] art: 选择设备查询逻辑修改, 点检工单新增时产线逻辑修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java | 359 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 355 insertions(+), 4 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java index 6e711c3..f395efd 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java @@ -7,11 +7,16 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.hssf.record.DVALRecord; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.eam.entity.Equipment; import org.jeecg.modules.eam.entity.FaultIntervalTime; +import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.service.IFaultIntervalTimeService; import org.jeecg.modules.eam.vo.EquipmentAvailabilityVo; import org.springframework.beans.factory.annotation.Autowired; @@ -20,11 +25,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.ParseException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Description: mom_eam_fault_interval_time @@ -37,8 +41,11 @@ @RequestMapping("/eam/faultIntervalTime") @Slf4j public class FaultIntervalTimeController extends JeecgController<FaultIntervalTime, IFaultIntervalTimeService> { + @Autowired private IFaultIntervalTimeService faultIntervalTimeService; + @Autowired + private IEamEquipmentService equipmentService; /** * 鍒嗛〉鍒楄〃鏌ヨ @@ -182,4 +189,348 @@ return jsonObject; } + /** + * 鐢熶骇璁惧骞冲潎鏁呴殰闂撮殧鏃堕棿MTBF + */ + @GetMapping("/get2MTBF") + public JSONObject get2MTBF(@RequestParam Map<String, Object> query) throws ParseException { + List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query); + List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>(); + for (Map<String, Object> map : equipmentList) { + query.put("equipmentId",map.get("id")); + + List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getEquipmentMTBF(query); + + FaultIntervalTime faultIntervalTime = new FaultIntervalTime(); + faultIntervalTime.setEquipmentId((String)map.get("id")); + faultIntervalTime.setEquipmentNum((String)map.get("num")); + faultIntervalTime.setEquipmentName((String)map.get("name")); + faultIntervalTime.setEquipmentModel((String)map.get("model")); + faultIntervalTime.setUserDepart((String)map.get("departName")); + if(equipmentMTBF.size()>0){ + faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString()); + faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString()); + faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString()); + faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString()); + //璁$畻mttr + BigDecimal repairTime = new BigDecimal(equipmentMTBF.get(0).get("repairTime").toString()); + BigDecimal faultNumber = new BigDecimal(equipmentMTBF.get(0).get("faultNumber").toString()); + BigDecimal averageRepairTime; + if(new BigDecimal(0).compareTo(faultNumber) == 0){ + averageRepairTime = new BigDecimal(0.00).setScale(2, RoundingMode.HALF_UP); + }else{ + averageRepairTime = repairTime.divide(faultNumber, 2, BigDecimal.ROUND_HALF_EVEN); + } + //璁$畻mtbf + //褰撴湁鏁呴殰鏃堕棿鏃禡TBF锛氾紙鎬诲彲鍒╃敤鏃堕棿-鎬绘晠闅滄椂闂达級/锛堟�绘晠闅滄鏁�+1锛� + //褰撴棤鏁呴殰鏃堕棿鏃禡TBF锛歁TBF=鎬诲彲鍒╃敤鏃堕棿 + BigDecimal averageFaultIntervalTime; + BigDecimal totalAvailableTime = new BigDecimal(equipmentMTBF.get(0).get("totalAvailableTime").toString()); + BigDecimal faultTime = new BigDecimal(equipmentMTBF.get(0).get("faultTime").toString()); + if(new BigDecimal(0).compareTo(faultNumber) == 0){ + averageFaultIntervalTime = new BigDecimal(totalAvailableTime + ".00").setScale(2, RoundingMode.HALF_UP);; + }else{ + averageFaultIntervalTime = (totalAvailableTime.subtract(faultTime)).divide(faultNumber, 2, BigDecimal.ROUND_HALF_EVEN); + } + //璁$畻瀹屽ソ鐜� 鍙紑鍔ㄧ巼 + BigDecimal totalDay = new BigDecimal(equipmentMTBF.get(0).get("totalDay").toString()); + BigDecimal repairDay = new BigDecimal(equipmentMTBF.get(0).get("repairDay").toString()); + BigDecimal serviceabilityRate = (totalDay.subtract(repairDay)).divide(totalDay,2, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100)); + + //鍙紑鍔ㄧ巼 +// BigDecimal totalAvailableTime = new BigDecimal(equipmentMTBF.get(0).get("totalAvailableTime").toString()); +// BigDecimal repairTime = new BigDecimal(equipmentMTBF.get(0).get("repairTime").toString()); + BigDecimal startRate = (totalAvailableTime.subtract(repairTime)).divide(totalAvailableTime,2, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100)); + + faultIntervalTime.setAverageRepairTime(averageRepairTime.toString()); + faultIntervalTime.setAverageFaultIntervalTime(averageFaultIntervalTime.toString()); + faultIntervalTime.setServiceabilityRate(serviceabilityRate+"%"); + faultIntervalTime.setStartRate(startRate+"%"); + faultIntervalTimeList.add(faultIntervalTime); + }else{ + List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getMTBFTotalAvailableTime(query); + if(query.get("startTime") != "" && query.get("endTime") != ""){ + faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + }else{ + faultIntervalTime.setTotalAvailableTime("0"); + faultIntervalTime.setNoFaultTime("0"); + faultIntervalTime.setAverageFaultIntervalTime("0.00"); + } + faultIntervalTime.setFaultTime("0"); + faultIntervalTime.setFaultNumber("0"); + faultIntervalTime.setAverageRepairTime("0.00"); + faultIntervalTime.setRepairTime("0"); + faultIntervalTime.setServiceabilityRate("0.00%"); + faultIntervalTime.setStartRate("0.00%"); + faultIntervalTimeList.add(faultIntervalTime); + } + + } +// Map<String,Object> result= new HashMap<>(); +// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>(); +// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("data",faultIntervalTimeList); + return jsonObject; + } + + + /** + * A绫荤敓浜ц澶囧钩鍧囨晠闅滈棿闅旀椂闂碝TBF + */ + @GetMapping("/getAMTBF") + public JSONObject getAMTBF(@RequestParam Map<String, Object> query) throws ParseException { + query.put("abc","A"); + List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query); + List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>(); + for (Map<String, Object> map : equipmentList) { + query.put("equipmentId",map.get("id")); + + List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getEquipmentMTBF(query); + + FaultIntervalTime faultIntervalTime = new FaultIntervalTime(); + faultIntervalTime.setEquipmentId((String)map.get("id")); + faultIntervalTime.setEquipmentNum((String)map.get("num")); + faultIntervalTime.setEquipmentName((String)map.get("name")); + faultIntervalTime.setEquipmentModel((String)map.get("model")); + faultIntervalTime.setUserDepart((String)map.get("departName")); + if(equipmentMTBF.size()>0){ + faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString()); + faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString()); + faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString()); + faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString()); + faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString()); + faultIntervalTimeList.add(faultIntervalTime); + }else{ + List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getMTBFTotalAvailableTime(query); + if(query.get("startTime") != "" && query.get("endTime") != ""){ + faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + }else{ + faultIntervalTime.setTotalAvailableTime("0"); + faultIntervalTime.setNoFaultTime("0"); + faultIntervalTime.setAverageFaultIntervalTime("0"); + } + faultIntervalTime.setFaultTime("0"); + faultIntervalTime.setFaultNumber("0"); + faultIntervalTime.setAverageRepairTime("0"); + faultIntervalTime.setRepairTime("0"); + faultIntervalTimeList.add(faultIntervalTime); + } + + } +// Map<String,Object> result= new HashMap<>(); +// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>(); +// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("data",faultIntervalTimeList); + return jsonObject; + } + + + /** + * 鍏抽敭銆侀噸瑕佺敓浜ц澶囧钩鍧囨晠闅滈棿闅旀椂闂碝TBF + */ + @GetMapping("/getGJZYMTBF") + public JSONObject getGJZYMTBF(@RequestParam Map<String, Object> query) throws ParseException { + query.put("specificEquipment","true"); + List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query); + List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>(); + for (Map<String, Object> map : equipmentList) { + query.put("equipmentId",map.get("id")); + + List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getEquipmentMTBF(query); + + FaultIntervalTime faultIntervalTime = new FaultIntervalTime(); + faultIntervalTime.setEquipmentId((String)map.get("id")); + faultIntervalTime.setEquipmentNum((String)map.get("num")); + faultIntervalTime.setEquipmentName((String)map.get("name")); + faultIntervalTime.setEquipmentModel((String)map.get("model")); + faultIntervalTime.setUserDepart((String)map.get("departName")); + if(equipmentMTBF.size()>0){ + faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString()); + faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString()); + faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString()); + faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString()); + faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString()); + faultIntervalTimeList.add(faultIntervalTime); + }else{ + List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getMTBFTotalAvailableTime(query); + if(query.get("startTime") != "" && query.get("endTime") != ""){ + faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + }else{ + faultIntervalTime.setTotalAvailableTime("0"); + faultIntervalTime.setNoFaultTime("0"); + faultIntervalTime.setAverageFaultIntervalTime("0"); + } + faultIntervalTime.setFaultTime("0"); + faultIntervalTime.setFaultNumber("0"); + faultIntervalTime.setAverageRepairTime("0"); + faultIntervalTime.setRepairTime("0"); + faultIntervalTimeList.add(faultIntervalTime); + } + + } +// Map<String,Object> result= new HashMap<>(); +// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>(); +// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("data",faultIntervalTimeList); + return jsonObject; + } + + /** + * 鍚勭敓浜у崟浣� 鐢熶骇璁惧骞冲潎鏁呴殰闂撮殧鏃堕棿MTBF + */ + @GetMapping("/getCenterMTBF") + public JSONObject getCenterMTBF(@RequestParam Map<String, Object> query) throws ParseException { + List<Map<String, Object>> workCenterList = faultIntervalTimeService.getWorkCenterList(query); + List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>(); + for (Map<String, Object> map : workCenterList) { + query.put("workCenterId",map.get("workCenterId")); + + List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getCenterEquipmentMTBF(query); + + FaultIntervalTime faultIntervalTime = new FaultIntervalTime(); +// faultIntervalTime.setEquipmentId((String)map.get("id")); +// faultIntervalTime.setEquipmentNum((String)map.get("num")); +// faultIntervalTime.setEquipmentName((String)map.get("name")); +// faultIntervalTime.setEquipmentModel((String)map.get("model")); + faultIntervalTime.setUserDepart((String)map.get("workCenterName")); + if(equipmentMTBF.size()>0){ + faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString()); + faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString()); + faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString()); + faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString()); + faultIntervalTime.setEquipmentNumer(equipmentMTBF.get(0).get("equipmentNumer").toString()); + + BigDecimal repairTime = new BigDecimal(equipmentMTBF.get(0).get("repairTime").toString()); + BigDecimal faultNumber = new BigDecimal(equipmentMTBF.get(0).get("faultNumber").toString()); + BigDecimal totalAvailableTime = new BigDecimal(equipmentMTBF.get(0).get("totalAvailableTime").toString()); + BigDecimal faultTime = new BigDecimal(equipmentMTBF.get(0).get("faultTime").toString()); + BigDecimal equipmentNumer = new BigDecimal(equipmentMTBF.get(0).get("equipmentNumer").toString()); + BigDecimal totalDay = new BigDecimal(equipmentMTBF.get(0).get("totalDay").toString()); + BigDecimal repairDay = new BigDecimal(equipmentMTBF.get(0).get("repairDay").toString()); + //璁$畻mttr 淇鏃堕棿/鏁呴殰娆℃暟 + BigDecimal averageRepairTime = repairTime.divide(faultNumber, 2, BigDecimal.ROUND_HALF_EVEN); + //璁$畻mtbf 锛堟�诲彲鍒╃敤鏃堕棿-鏁呴殰鏃堕棿锛�/鏁呴殰娆℃暟 + BigDecimal averageFaultIntervalTime; + if(new BigDecimal(0).compareTo(faultNumber)==0){ + averageFaultIntervalTime = new BigDecimal("0.00").setScale(2, RoundingMode.HALF_UP); + }else{ + averageFaultIntervalTime = (totalAvailableTime.subtract(faultTime)).divide(faultNumber, 2, BigDecimal.ROUND_HALF_EVEN); + } + //瀹屽ソ鐜� 锛堢粺璁″ぉ鏁�*璁惧鏁伴噺-鏁呴殰澶╂暟锛�/锛堢粺璁″ぉ鏁�*璁惧鏁伴噺锛� + BigDecimal serviceabilityRate = ((totalDay.multiply(equipmentNumer)).subtract(repairDay)).divide((totalDay.multiply(equipmentNumer)), 2, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100)); + //寮�鍔ㄧ巼 锛堟�诲彲鍒╃敤鏃堕棿-鏁呴殰鏃堕棿锛�/鎬诲彲鍒╃敤鏃堕棿 + BigDecimal startRate = (totalAvailableTime.subtract(faultTime)).divide(totalAvailableTime, 2, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100)); + + faultIntervalTime.setAverageRepairTime(averageRepairTime.toString()); + faultIntervalTime.setAverageFaultIntervalTime(averageFaultIntervalTime.toString()); + faultIntervalTime.setServiceabilityRate(serviceabilityRate+"%"); + faultIntervalTime.setStartRate(startRate+"%"); + faultIntervalTimeList.add(faultIntervalTime); + }else{ + List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getCenterMTBFTotalAvailableTime(query); + if(query.get("startTime") != "" && query.get("endTime") != ""){ + faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime("0.00"); + }else{ + faultIntervalTime.setTotalAvailableTime("0"); + faultIntervalTime.setNoFaultTime("0"); + faultIntervalTime.setAverageFaultIntervalTime("0.00"); + } + faultIntervalTime.setFaultTime("0"); + faultIntervalTime.setFaultNumber("0"); + faultIntervalTime.setEquipmentNumer("0"); + faultIntervalTime.setAverageRepairTime("0.00"); + faultIntervalTime.setRepairTime("0"); + faultIntervalTime.setServiceabilityRate("0.00%"); + faultIntervalTime.setStartRate("0.00%"); + faultIntervalTime.setStartTime("0"); + faultIntervalTimeList.add(faultIntervalTime); + } + + } +// Map<String,Object> result= new HashMap<>(); +// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>(); +// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("data",faultIntervalTimeList); + return jsonObject; + } + + + + /** + * 鍚勭敓浜у崟浣� A绫昏澶囧钩鍧囨晠闅滈棿闅旀椂闂碝TBF + */ + @GetMapping("/getCenterAMTBF") + public JSONObject getCenterAMTBF(@RequestParam Map<String, Object> query) throws ParseException { + query.put("abc","A"); + List<Map<String, Object>> workCenterList = faultIntervalTimeService.getWorkCenterList(query); + List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>(); + for (Map<String, Object> map : workCenterList) { + query.put("workCenterId",map.get("workCenterId")); + + List<Map<String, Object>> equipmentMTBF = faultIntervalTimeService.getCenterEquipmentMTBF(query); + + FaultIntervalTime faultIntervalTime = new FaultIntervalTime(); +// faultIntervalTime.setEquipmentId((String)map.get("id")); +// faultIntervalTime.setEquipmentNum((String)map.get("num")); +// faultIntervalTime.setEquipmentName((String)map.get("name")); +// faultIntervalTime.setEquipmentModel((String)map.get("model")); + faultIntervalTime.setUserDepart((String)map.get("workCenterName")); + if(equipmentMTBF.size()>0){ + faultIntervalTime.setTotalAvailableTime(equipmentMTBF.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString()); + faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString()); + faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString()); + faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString()); + faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString()); + faultIntervalTimeList.add(faultIntervalTime); + }else{ + List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getCenterMTBFTotalAvailableTime(query); + if(query.get("startTime") != "" && query.get("endTime") != ""){ + faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString()); + }else{ + faultIntervalTime.setTotalAvailableTime("0"); + faultIntervalTime.setNoFaultTime("0"); + faultIntervalTime.setAverageFaultIntervalTime("0"); + } + faultIntervalTime.setFaultTime("0"); + faultIntervalTime.setFaultNumber("0"); + faultIntervalTime.setAverageRepairTime("0"); + faultIntervalTime.setRepairTime("0"); + faultIntervalTimeList.add(faultIntervalTime); + } + + } +// Map<String,Object> result= new HashMap<>(); +// IPage<FaultIntervalTime> pageData = new Page<FaultIntervalTime>(); +// List<FaultIntervalTime> list = faultIntervalTimeService.getMTBF(query); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("data",faultIntervalTimeList); + return jsonObject; + } + + + + + } -- Gitblit v1.9.3