*）故障导出报错

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentFaultController.java

@@ -85,7 +85,7 @@ public class EquipmentFaultController {
 //    }
 
     @ApiOperation(value = "导出故障清单", notes = "导出故障清单", produces = "application/octet-stream")
-    @PostMapping(value = "/exportData")
+    @GetMapping(value = "/exportData")
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     public void exportDangerList(@RequestParam(required = false) String code,
                                  @RequestParam(required = false)String eqCode,

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentCategoryServiceImpl.java

@@ -242,10 +242,14 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
     public List<EquipmentCategory> getEquipmentCategoryById(String id) {
         List<EquipmentCategory> list = new ArrayList<>();
         LambdaQueryWrapper<EquipmentCategory> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(EquipmentCategory::getId, id);
-        EquipmentCategory equipmentCategory = this.baseMapper.selectOne(wrapper);
-        list.add(equipmentCategory);
-        this.buildByRecursive(id, list);
+        if (ValidationUtil.isEmpty(id)){
+            return this.baseMapper.selectList(wrapper);
+        } else {
+            wrapper.in(EquipmentCategory::getId, id);
+            EquipmentCategory equipmentCategory = this.baseMapper.selectOne(wrapper);
+            list.add(equipmentCategory);
+            this.buildByRecursive(id, list);
+        }
         return list;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentFaultServiceImpl.java

@@ -138,7 +138,60 @@ public class EquipmentFaultServiceImpl implements IEquipmentFaultService {
 
     @Override
     public List<EquipmentFaultVO> getAll(String code, String eqCode, String name, String faultOccurTime, String type, String agencyName) {
-        return equipmentFaultMapper.getAll(code, eqCode, name, faultOccurTime, type, agencyName);
-    }
+        List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.getEquipmentCategoryById(code);
+        List<String> codes = equipmentCategoryList.stream().map(EquipmentCategory::getCode).collect(Collectors.toList());
+        List<EquipmentDetail> equipmentDetails = equipmentDetailService.getListByCodes(codes, eqCode, name, agencyName);
+        List<EquipmentFaultKnowledge> equipmentFaultKnowledgeList = iEquipmentFaultKnowledgeService.list();
+
+        Map<String, EquipmentCategory> equipmentCategoryMap = equipmentCategoryList.stream().collect(Collectors.toMap(EquipmentCategory::getCode, entity -> entity));
+        Map<String, EquipmentDetail> equipmentDetailMap = equipmentDetails.stream().collect(Collectors.toMap(EquipmentDetail::getEqcode, entity -> entity));
+        Map<String, EquipmentFaultKnowledge> equipmentFaultKnowledgeMap = equipmentFaultKnowledgeList.stream().collect(Collectors.toMap(EquipmentFaultKnowledge::getType, entity -> entity));
 
+        JSONObject map = new JSONObject();
+        map.put("samplingTime", faultOccurTime);
+
+        codes = equipmentDetails.stream().map(EquipmentDetail::getEqcode).collect(Collectors.toList());
+        map.put("deviceIds", codes);
+        if (!ValidationUtil.isEmpty(type)) {
+            List<EquipmentFaultKnowledge> collect = equipmentFaultKnowledgeList.stream().filter(x -> x.getId().equals(Long.valueOf(type))).collect(Collectors.toList());
+            if (!ValidationUtil.isEmpty(collect)) {
+                map.put("analysisResult", collect.get(0).getType());
+            }
+        }
+        ResponseModel<Object> result = kgdFeignClient.getPredictionResultForPage(0, Integer.MAX_VALUE, map);
+        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(result.getResult()));
+        JSONArray records = jsonObject.getJSONArray("records");
+
+        List<EquipmentFaultVO> equipmentFaultVOList = records.stream().map(x -> {
+            JSONObject xObj = (JSONObject) x;
+            EquipmentFaultVO equipmentFaultVO = new EquipmentFaultVO();
+            equipmentFaultVO.setEqCode(xObj.getString("deviceId"));
+            equipmentFaultVO.setId(xObj.getLong("id"));
+            try {
+                equipmentFaultVO.setFaultOccurTime(DateUtil.formatStringToDate(xObj.getString("samplingtime"), DateUtil.Y_M_D_HMS));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            EquipmentDetail equipmentDetail = equipmentDetailMap.get(xObj.getString("deviceId"));
+            EquipmentFaultKnowledge equipmentFaultKnowledge = equipmentFaultKnowledgeMap.get(xObj.getString("analysisResult"));
+            if (!ValidationUtil.isEmpty(equipmentDetail)) {
+                equipmentFaultVO.setName(equipmentDetail.getName());
+                equipmentFaultVO.setAgencyName(equipmentDetail.getCompanyName());
+                EquipmentCategory equipmentCategory = equipmentCategoryMap.get(equipmentDetail.getCode());
+                if (!ValidationUtil.isEmpty(equipmentCategory)) {
+                    equipmentFaultVO.setEqName(equipmentCategory.getName());
+                }
+            }
+            if (!ValidationUtil.isEmpty(equipmentFaultKnowledge)) {
+                equipmentFaultVO.setType(equipmentFaultKnowledge.getType());
+                equipmentFaultVO.setReason(equipmentFaultKnowledge.getReason());
+                equipmentFaultVO.setMeasure(equipmentFaultKnowledge.getMeasure());
+                equipmentFaultVO.setRemark(equipmentFaultKnowledge.getRemark());
+            }
+            return equipmentFaultVO;
+        }).collect(Collectors.toList());
+        return equipmentFaultVOList;
+//        return equipmentFaultMapper.getAll(code, eqCode, name, faultOccurTime, type, agencyName);
+    }
 }