倍率统计报表算法调整

yb

昨天 ec33a83aa39eedaf39675d4ef7be5f133f556846

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

@@ -58,6 +58,9 @@
    @Override
    public void savesEquipmentMagnifications(String dateTime) {
        List<MdcEquipmentMagnification> magnifications = new ArrayList<>();
        List<Equipment> equipmentList = equipmentService.list();
        Map<String,List<MdcDriveTypeParamConfig>> map = new HashMap<>();
        Date now =  DateUtils.plusTime(DateUtils.getNow(), -1);
        //主轴倍率
        //进给倍率
       /* Equipment e = equipmentService.getById("12345678");
@@ -73,23 +76,30 @@
            } catch (Exception ee) {
                log.error("参数格式不对", ee);
            }


        }
        List<Equipment> equipmentList = equipmentService.list();
        Map<String,List<MdcDriveTypeParamConfig>> map = new HashMap<>();
        Date now =  DateUtils.plusTime(DateUtils.getNow(), -1);
        for (Equipment equipment : equipmentList) {
            Date start = null;
            List<String> dates = new ArrayList<>();
            //查询最后一条记录
            MdcEquipmentMagnification mdcMagnification = super.baseMapper.getMaxStaticsData(equipment.getEquipmentid());
            if (mdcMagnification == null) {
                start = DateUtils.plusTime(DateUtils.getNow(), -20);
            if (StringUtils.isNotBlank(dateTime)) {
                Date initDate = DateUtils.toDate(dateTime, "yyyyMMdd");
                String date = DateUtils.format(initDate,DateUtils.STR_DATE);
                dates.add(date);
            } else {
                start = DateUtils.toDate(mdcMagnification.getTheDate(),DateUtils.STR_DATE );
                if (now.toString().equals(start.toString())) {
                    continue;
                MdcEquipmentMagnification mdcMagnification = super.baseMapper.getMaxStaticsData(equipment.getEquipmentid());
                if (mdcMagnification == null) {
                    start = DateUtils.plusTime(DateUtils.getNow(), -20);
                } else {
                    start = DateUtils.toDate(mdcMagnification.getTheDate(),DateUtils.STR_DATE );
                    if (now.toString().equals(start.toString())) {
                        continue;
                    }
                }
                dates = DateUtils.getDatesStringList(start,now);
            }
            List<String> dates = DateUtils.getDatesStringList(start,now);

            List<MdcDriveTypeParamConfig> list = new ArrayList<>();
            if (!map.containsKey(equipment.getDrivetype())) {
                MdcDriveTypeParamConfig config1 = mdcDriveTypeParamConfigService.getEnglishName(spindlebeilv,equipment.getDrivetype());
@@ -356,8 +366,8 @@
                            a.getSpindlebeilv().add(b.getSpindlebeilv()))).ifPresent(result::add);
                });
        for (MdcEquipmentMagnificationDto mdcEquipmentMagnificationDto : result) {
            mdcEquipmentMagnificationDto.setSpindlebeilv(mdcEquipmentMagnificationDto.getSpindlebeilv().divide(new BigDecimal(mdcMagnificationVos.size()), 2, RoundingMode.HALF_UP));
            mdcEquipmentMagnificationDto.setFeedbeilv(mdcEquipmentMagnificationDto.getFeedbeilv().divide(new BigDecimal(mdcMagnificationVos.size()), 2, RoundingMode.HALF_UP));
            mdcEquipmentMagnificationDto.setSpindlebeilv(mdcEquipmentMagnificationDto.getSpindlebeilv().divide(new BigDecimal(mdcMagnificationVos.size()), 2, RoundingMode.HALF_UP));
        }
        result.sort(Comparator.comparing(MdcEquipmentMagnificationDto::getTheDate));
        return result;
@@ -365,6 +375,7 @@

    private MdcEquipmentMagnificationDto setDataList(List<MdcEquipmentMagnificationDto> list,String date,String equipmentId,MdcEquipmentMagnificationDto mdcMagnificationDto) {
        MdcEquipmentMagnificationDto result = new MdcEquipmentMagnificationDto();
        result.setTheDate(date);
        if (list != null && list.size() > 0) {
            for (MdcEquipmentMagnificationDto mdcEquipmentMagnificationDto : list) {
                if (date.equals(mdcEquipmentMagnificationDto.getTheDate()) && mdcEquipmentMagnificationDto.getEquipmentId().equals(equipmentId)) {