接口设备权限漏洞修复

lius

2023-07-03 224af4ccd20c299c5f616bfc72a44494cd39bc9b

接口设备权限漏洞修复

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

@@ -50,17 +50,17 @@
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(mdcDeviceCalendarQueryVo.getParentId()) && StringUtils.isEmpty(mdcDeviceCalendarQueryVo.getEquipmentId())) {
            if ("2".equals(mdcDeviceCalendarQueryVo.getTypeTree())) {
                //部门层级
                // 部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcDeviceCalendarQueryVo.getParentId());
            } else {
                //产线层级
                // 产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcDeviceCalendarQueryVo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(mdcDeviceCalendarQueryVo.getEquipmentId())) {
            //单台设备信息
            // 单台设备信息
            mdcDeviceCalendarQueryVo.setEquipmentIdList(Collections.singletonList(mdcDeviceCalendarQueryVo.getEquipmentId()));
        } else {
            //查询用户拥有的所有设备信息
            // 查询用户拥有的所有设备信息
            if ("2".equals(mdcDeviceCalendarQueryVo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
@@ -73,6 +73,10 @@
            mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
        }

        if (mdcDeviceCalendarQueryVo.getEquipmentIdList() == null || mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) {
            return null;
        }

        return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo);
    }


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

@@ -76,32 +76,36 @@
            vo.setEquipmentIdList(equipmentIds);
        }

        // 查询利用率数据
        List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo);
        // 利用率等级
        List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");

        //封装结果
        List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()));

        List<String> dates = DateUtils.getDatesStringList2(DateUtils.getShortDate2(vo.getStartTime()), DateUtils.getShortDate2(vo.getEndTime()));

        for (MdcEquipment mdcEquipment : equipmentList) {
            MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
            mdcEfficiencyListDto.setEquipmentId(mdcEquipment.getEquipmentId());
            mdcEfficiencyListDto.setEquipmentName(mdcEquipment.getEquipmentName());
            mdcEfficiencyListDto.setEquipmentType(mdcEquipment.getEquipmentType());
            List<MdcEfficiencyResultDto> list = new ArrayList<>();
            for (String date : dates) {
                list.add(this.efficiencyRate(efficiencyList, date, mdcEquipment, mdcUtilizationRateList));
            }
            mdcEfficiencyListDto.setDataList(list);
            listDtos.add(mdcEfficiencyListDto);
        }

        result.setMdcEfficiencyList(listDtos);
        result.setDates(dates);

        if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
            result.setMdcEfficiencyList(listDtos);
        } else {
            // 查询利用率数据
            List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo);
            // 利用率等级
            List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");

            //封装结果
            List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()));

            for (MdcEquipment mdcEquipment : equipmentList) {
                MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
                mdcEfficiencyListDto.setEquipmentId(mdcEquipment.getEquipmentId());
                mdcEfficiencyListDto.setEquipmentName(mdcEquipment.getEquipmentName());
                mdcEfficiencyListDto.setEquipmentType(mdcEquipment.getEquipmentType());
                List<MdcEfficiencyResultDto> list = new ArrayList<>();
                for (String date : dates) {
                    list.add(this.efficiencyRate(efficiencyList, date, mdcEquipment, mdcUtilizationRateList));
                }
                mdcEfficiencyListDto.setDataList(list);
                listDtos.add(mdcEfficiencyListDto);
            }

            result.setMdcEfficiencyList(listDtos);
        }

        return result;
    }


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

@@ -160,6 +160,10 @@
            repair.setMdcSectionIds(equipmentIds);
        }

        if (repair.getMdcSectionIds() == null || repair.getMdcSectionIds().isEmpty()) {
            return null;
        }

        return this.baseMapper.pageList(page, repair);
    }