update

Lius

2024-03-04 e47fb46bbf5c463ed67a44235d3ae2b63e186d7a

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java

@@ -525,4 +525,20 @@
        }
        return Result.OK("反馈成功！");
    }


    @AutoLog(value = "设备表-通过车间ids获取设备树")
    @ApiOperation(value = "设备表-通过车间ids获取设备树", notes = "设备表-通过车间ids获取设备树")
    @GetMapping(value = "/loadTreeListByProductionIds")
    public Result<?> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) {
        Result<List<MdcEquipmentTree>> result = new Result<>();
        try {
            List<MdcEquipmentTree> mdcEquipmentTreeList = mdcEquipmentService.loadTreeListByProductionIds(ids);
            result.setSuccess(true);
            result.setResult(mdcEquipmentTreeList);
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }
        return result;
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java

@@ -189,4 +189,10 @@
     */
    List<MdcEquipment> exportXlsList(MdcEquipmentVo mdcEquipment);

    /**
     * 通过车间ids获取设备树
     * @param ids
     * @return
     */
    List<MdcEquipmentTree> loadTreeListByProductionIds(String ids);
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java

@@ -455,7 +455,7 @@
                            } else {
                                value = "无";
                            }
                        }  else if ("alarmContent".equals(englishName)) {
                        } else if ("alarmContent".equals(englishName)) {
                            if (oporation == 22) {
                                List<MdcAlarmInfo> mdcAlarmInfo = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getDriveType, mdcEquipment.getDriveType()).eq(MdcAlarmInfo::getAlarmCode, equipmentLog.getAlarm()).eq(MdcAlarmInfo::getIsUse, 0));
                                if (mdcAlarmInfo != null && !mdcAlarmInfo.isEmpty()) {
@@ -790,45 +790,6 @@
                    }
                }
            }


//            //查询单表数据
//            MdcEquipmentDto mdcEquipmentDto = this.baseMapper.getWorkLineLast(saveTableName);
//            if (mdcEquipmentDto != null) {
//                MessageDTO messageDTO = new MessageDTO();
//                messageDTO.setTitle("设备运行转速报警！");
//                messageDTO.setCategory("预警消息");
//                messageDTO.setFromUser("admin");
//                messageDTO.setToUser("admin");
//                Integer spindlespeed = Integer.valueOf(mdcEquipmentDto.getSpindlespeed());
//                Integer actualspindlespeed = Integer.valueOf(mdcEquipmentDto.getActualspindlespeed());
//                if (range.equals(0)) {
//                    if (spindlespeed > actualspindlespeed) {
//                        // 实际值大于设定值   高
//                        messageDTO.setContent("设备编号为 [" + mdcEquipment.getEquipmentId() + "] 的设备运行转速高报警！");
//                        sysBaseApi.sendSysAnnouncement(messageDTO);
//                    } else if (spindlespeed < actualspindlespeed) {
//                        // 实际值小于设定值   低
//                        messageDTO.setContent("设备编号为 [" + mdcEquipment.getEquipmentId() + "] 的设备运行转速低报警！");
//                        sysBaseApi.sendSysAnnouncement(messageDTO);
//                    }
//                } else {
//                    int max = actualspindlespeed + actualspindlespeed * (range / 100);
//                    int min = actualspindlespeed - actualspindlespeed * (range / 100);
//                    if (spindlespeed > max || spindlespeed < min) {
//                        if (spindlespeed > actualspindlespeed) {
//                            // 实际值大于设定值   高
//                            messageDTO.setContent("设备编号为 [" + mdcEquipment.getEquipmentId() + "] 的设备运行转速高报警！");
//                            sysBaseApi.sendSysAnnouncement(messageDTO);
//                        } else if (spindlespeed < actualspindlespeed) {
//                            // 实际值小于设定值   低
//                            messageDTO.setContent("设备编号为 [" + mdcEquipment.getEquipmentId() + "] 的设备运行转速低报警！");
//                            sysBaseApi.sendSysAnnouncement(messageDTO);
//                        }
//                    }
//                }
//
//            }
        }

    }
@@ -849,4 +810,31 @@
        return this.baseMapper.exportXlsList(mdcEquipment);
    }

    /**
     * 通过车间ids获取设备树
     *
     * @param ids
     * @return
     */
    @Override
    public List<MdcEquipmentTree> loadTreeListByProductionIds(String ids) {
        List<String> productionIds = Arrays.asList(ids.split(","));
        //获取所有产线数据
        List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(MdcProduction::getProductionOrder));
        List<String> allProductionIds = new ArrayList<>();
        //找到所有产线id的上级id
        if (!productionIds.isEmpty()) {
            for (String productionId : productionIds) {
                this.getAllProductionIds(productionList, productionId, allProductionIds);
            }
        }
        //过滤产线数据
        List<MdcProduction> list = productionList.stream().filter((MdcProduction mdcProduction) -> allProductionIds.contains(mdcProduction.getId())).collect(Collectors.toList());
        //组装产线设备树
        List<MdcEquipmentTree> treeList = FindsEquipmentProductionUtil.wrapEquipmentProductionTreeList(list);
        //填充设备数据
        FillEquipmentByProduction(treeList);
        return treeList;
    }

}