倍率统计服务bug调整

yb

昨天 45f273a2bdef5db34da34a1ac72ee26da5452c8d

倍率统计服务bug调整

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

@@ -13,6 +13,7 @@
import org.jeecg.modules.mdc.entity.MdcProcessQuantity;
import org.jeecg.modules.mdc.service.IMdcEquipmentMagnificationService;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
import org.jeecg.modules.mdc.vo.MdcMagnificationVo;
import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -52,6 +53,7 @@




    /**
     * å¯¼å‡ºexcel
     *
@@ -64,4 +66,19 @@
        String userId = user.getId();
        return service.exportXls(userId, magnificationVo);
    }

    /**
     * å€çŽ‡æŠ¥è¡¨
     * @param magnificationVo
     * @return
     */
    @AutoLog(value = "倍率报表")
    @ApiOperation(value = "倍率报表", notes = "倍率报表")
    @RequestMapping(value = "/beilvList")
    public MdcMagnificationVo beilvList(MdcEquipmentMagnificationVo magnificationVo) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        MdcMagnificationVo vo = service.beilvsList(magnificationVo,userId);
        return vo;
    }
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentMagnificationDto.java

@@ -23,4 +23,15 @@
    @Excel(name = "日期", width = 15)
    private String theDate;


    public MdcEquipmentMagnificationDto(String theDate, BigDecimal spindlebeilv, BigDecimal feedbeilv) {
        this.theDate = theDate;
        this.spindlebeilv = spindlebeilv;
        this.feedbeilv = feedbeilv;
    }

    public MdcEquipmentMagnificationDto() {

    }

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/EquipmentMagnificationJob.java

@@ -18,7 +18,11 @@
import java.util.List;
@Slf4j
public class EquipmentMagnificationJob implements Job {
    private String parameter;

    public void setParameter(String parameter) {
        this.parameter = parameter;
    }
    @Resource
    private IMdcEquipmentMagnificationService mdcEquipmentMagnificationService;

@@ -39,10 +43,11 @@
        if (byJobClassName != null && !byJobClassName.isEmpty()) {
            quartzLog.setJobId(byJobClassName.get(0).getId());
        }
        quartzLog.setParams(this.parameter);
        log.info("倍率统计 EquipmentMagnificationJob start!  æ—¶é—´:" + DateUtils.now());
        long startTime = System.currentTimeMillis();
        try {
            mdcEquipmentMagnificationService.savesEquipmentMagnifications();
            mdcEquipmentMagnificationService.savesEquipmentMagnifications(this.parameter);
            quartzLog.setIsSuccess(0);
        } catch (Exception e) {
            quartzLog.setIsSuccess(-1);

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcEquipmentMagnification;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
import org.jeecg.modules.mdc.vo.MdcMagnificationVo;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
@@ -12,7 +13,7 @@
    /**
     * ç»Ÿè®¡ æŠ¥è¡¨æ•°æ®
     */
    void savesEquipmentMagnifications();
    void savesEquipmentMagnifications(String dateTime);


    IPage<MdcEquipmentMagnification> pageList(String userId, MdcEquipmentMagnificationVo magnificationVo, Integer pageNo, Integer pageSize, HttpServletRequest req);
@@ -26,4 +27,7 @@
     * @return
     */
    ModelAndView exportXls(String userId, MdcEquipmentMagnificationVo magnificationVo);


    MdcMagnificationVo beilvsList(MdcEquipmentMagnificationVo magnificationVo,String userId);
}

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

@@ -9,10 +9,7 @@
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
import org.jeecg.modules.mdc.vo.*;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -174,6 +171,8 @@

    List<String> listEquipmentId(MdcEfficiencyReportQueryVo vo);

    List<String> listEquipmentMagnificationId(MdcEquipmentMagnificationVo vo);

    /**
     * åˆ—表查询
     */

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

@@ -1,20 +1,25 @@
package org.jeecg.modules.mdc.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcEquipmentMagnificationDto;
import org.jeecg.modules.mdc.entity.Equipment;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.entity.MdcEquipmentMagnification;
import org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection;
import org.jeecg.modules.mdc.dto.*;
import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcEquipmentMagnificationMapper;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcEquipmentMagnificationVo;
import org.jeecg.modules.mdc.vo.MdcMagnificationEquipmentVo;
import org.jeecg.modules.mdc.vo.MdcMagnificationVo;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -38,17 +43,33 @@
    private IMdcEquipmentRunningSectionService mdcEquipmentRunningSectionService;
    @Resource
    private IMdcEquipmentService mdcEquipmentService;
    @Resource
    private ISysDepartService sysDepartService;
    @Resource
    private IMdcProductionService mdcProductionService;


    private static String spindlebeilv = "主轴倍率";
    private static String feedbeilv = "进给倍率";
    @Override
    public void savesEquipmentMagnifications() {
    public void savesEquipmentMagnifications(String dateTime) {
        List<MdcEquipmentMagnification> magnifications = new ArrayList<>();
        //主轴倍率
        //进给倍率
       /* Equipment e = equipmentService.getById("12345678");
        List<Equipment> equipmentList = new ArrayList<>();
        equipmentList.add(e);*/
        if (org.apache.commons.lang.StringUtils.isNotBlank(dateTime)) {
            try {
                Date initDate = DateUtils.toDate(dateTime, "yyyyMMdd");
                String date = DateUtils.format(initDate,DateUtils.STR_DATE);
                if (initDate != null) {
                    this.remove(new LambdaQueryWrapper<MdcEquipmentMagnification>().eq(MdcEquipmentMagnification::getTheDate, date));
                }
            } 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);
@@ -57,7 +78,7 @@
            //查询最后一条记录
            MdcEquipmentMagnification mdcMagnification = super.baseMapper.getMaxStaticsData(equipment.getEquipmentid());
            if (mdcMagnification == null) {
                start = DateUtils.plusTime(DateUtils.getNow(), -5);
                start = DateUtils.plusTime(DateUtils.getNow(), -20);
            } else {
                start = DateUtils.toDate(mdcMagnification.getTheDate(),DateUtils.STR_DATE );
                if (now.toString().equals(start.toString())) {
@@ -181,6 +202,161 @@
        return mv;
    }

    @Override
    public MdcMagnificationVo beilvsList(MdcEquipmentMagnificationVo vo, String userId) {
        List<MdcMagnificationEquipmentVo> mdcMagnificationVos = new ArrayList<>();
        MdcMagnificationVo result = new MdcMagnificationVo();
        List<String> equipmentIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(vo.getParentId()) && StringUtils.isEmpty(vo.getEquipmentId())) {
            if ("2".equals(vo.getTypeTree())) {
                // éƒ¨é—¨å±‚级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, vo.getParentId());
            } else {
                // äº§çº¿å±‚级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, vo.getParentId());
            }
        } else if (StringUtils.isNotEmpty(vo.getEquipmentId())) {
            // å•å°è®¾å¤‡ä¿¡æ¯
            vo.setEquipmentIdList(Collections.singletonList(vo.getEquipmentId()));
        } else {
            // æŸ¥è¯¢ç”¨æˆ·æ‹¥æœ‰çš„所有设备信息
            if ("2".equals(vo.getTypeTree())) {
                //部门层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
            } else {
                //产线层级
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
            vo.setEquipmentIdList(equipmentIds);
        }

        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        List<String> dates = DateUtils.getDatesStringList(DateUtils.getShortDate(vo.getStartTime()), DateUtils.getShortDate(vo.getEndTime()));
        result.setDates(dates);

        if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
            result.setMdcMagnificationVos(mdcMagnificationVos);
        } else {
            List<String> equipmentIdList = mdcEquipmentService.listEquipmentMagnificationId(vo);
            if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
                vo.setEquipmentIdList(equipmentIdList);
            } else {
                result.setMdcMagnificationVos(mdcMagnificationVos);
                return result;
            }
            // æŸ¥è¯¢åˆ©ç”¨çŽ‡æ•°æ®
            List<MdcEquipmentMagnificationDto> magnificationDtos = super.baseMapper.list(vo);
            // å°è£…结果
            if ("2".equals(vo.getTypeTree())) {
            } else {
                // äº§çº¿å±‚级
                List<MdcEquProDto> equipmentList = mdcEquipmentService.findEquProList(vo.getEquipmentIdList());
                // æŸ¥è¯¢æ‰€æœ‰äº§çº¿ä¿¡æ¯
                List<MdcProduction> productionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().ne(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(MdcProduction::getProductionOrder));
                for (MdcEquProDto mdcEquProDto : equipmentList) {
                    MdcMagnificationEquipmentVo mdcMgVo = new MdcMagnificationEquipmentVo();
                    mdcMgVo.setEquipmentId(mdcEquProDto.getEquipmentId());
                    mdcMgVo.setEquipmentName(mdcEquProDto.getEquipmentName());
                    mdcMgVo.setEquipmentType(mdcEquProDto.getEquipmentType());
                    switch (mdcEquProDto.getOrgType()) {
                        case "1":
                            mdcMgVo.setLevel1(mdcEquProDto.getProductionName());
                            break;
                        case "2":
                            mdcMgVo.setLevel2(mdcEquProDto.getProductionName());
                            break;
                        case "3":
                            mdcMgVo.setLevel3(mdcEquProDto.getProductionName());
                            break;
                        default:
                    }
                    MdcProduction mdcProduction = productionList.stream().filter(production -> production.getId().equals(mdcEquProDto.getParentId())).findAny().orElse(null);
                    if (mdcProduction != null) {
                        switch (mdcProduction.getOrgType()) {
                            case "1":
                                mdcMgVo.setLevel1(mdcProduction.getProductionName());
                                break;
                            case "2":
                                mdcMgVo.setLevel2(mdcProduction.getProductionName());
                                break;
                            case "3":
                                mdcMgVo.setLevel3(mdcProduction.getProductionName());
                                break;
                            default:
                        }
                        if (StringUtils.isNotEmpty(mdcProduction.getParentId())) {
                            productionList.stream().filter(production -> production.getId().equals(mdcProduction.getParentId())).findAny().ifPresent(production1 -> {
                                switch (production1.getOrgType()) {
                                    case "1":
                                        mdcMgVo.setLevel1(production1.getProductionName());
                                        break;
                                    case "2":
                                        mdcMgVo.setLevel2(production1.getProductionName());
                                        break;
                                    case "3":
                                        mdcMgVo.setLevel3(production1.getProductionName());
                                        break;
                                    default:
                                }
                            });
                        }
                    }
                    List<MdcEquipmentMagnificationDto> list = new ArrayList<>();
                    MdcEquipmentMagnificationDto mdcMagnificationDto = new MdcEquipmentMagnificationDto();
                    mdcMagnificationDto.setTheDate("平均值");
                    for (String date : dates) {
                        list.add(this.setDataList(magnificationDtos, date, mdcEquProDto.getEquipmentId(),mdcMagnificationDto));
                    }
                    mdcMagnificationDto.setFeedbeilv(mdcMagnificationDto.getFeedbeilv().divide(new BigDecimal(dates.size()),2, RoundingMode.HALF_UP));
                    mdcMagnificationDto.setSpindlebeilv(mdcMagnificationDto.getSpindlebeilv().divide(new BigDecimal(dates.size()),2, RoundingMode.HALF_UP));
                    list.add(mdcMagnificationDto);
                    mdcMgVo.setMdcBeilvVoList(list);
                    mdcMagnificationVos.add(mdcMgVo);
                }
            }
            result.setMdcMagnificationVos(mdcMagnificationVos);
        }
        // æ·»åŠ åˆè®¡å€¼å’Œå¹³å‡å€¼

        result.getDates().add("平均值");
        MdcMagnificationEquipmentVo avg = new MdcMagnificationEquipmentVo();
        avg.setLevel1("平均值");
        avg.setLevel2("平均值");
        avg.setLevel3("平均值");
        avg.setEquipmentId("平均值");
        avg.setEquipmentName("平均值");
        avg.setEquipmentType("平均值");
        //计算平均值
        avg.setMdcBeilvVoList(null);
        result.getMdcMagnificationVos().add(avg);
        return result;
    }

    private MdcEquipmentMagnificationDto setDataList(List<MdcEquipmentMagnificationDto> list,String date,String equipmentId,MdcEquipmentMagnificationDto mdcMagnificationDto) {
        MdcEquipmentMagnificationDto result = new MdcEquipmentMagnificationDto();
        if (list != null && list.size() > 0) {
            for (MdcEquipmentMagnificationDto mdcEquipmentMagnificationDto : list) {
                if (date.equals(mdcEquipmentMagnificationDto.getTheDate()) && mdcEquipmentMagnificationDto.getEquipmentId().equals(equipmentId)) {
                    result.setEquipmentId(equipmentId);
                    result.setSpindlebeilv(mdcEquipmentMagnificationDto.getSpindlebeilv());
                    result.setFeedbeilv(mdcEquipmentMagnificationDto.getFeedbeilv());
                }
            }
        } else {
            result.setTheDate(date);
            result.setFeedbeilv(new BigDecimal(0));
            result.setEquipmentId(equipmentId);
            result.setSpindlebeilv(new BigDecimal(0));
            return result;
        }
        mdcMagnificationDto.setFeedbeilv(mdcMagnificationDto.getFeedbeilv().add(result.getFeedbeilv()));
        mdcMagnificationDto.setSpindlebeilv(mdcMagnificationDto.getSpindlebeilv().add(result.getSpindlebeilv()));
        return result;
    }


    private MdcEquipmentMagnification selectMagnification(String equipmentId,String date,String drivetype,List<MdcDriveTypeParamConfig> list) {
        Date startTime = DateUtils.plusTime(DateUtils.getShortDate(date), 0);
        Date endTime = DateUtils.plusTime(DateUtils.getShortDate(date), 1);
@@ -224,14 +400,14 @@
                    info.setSpindlebeilvValue(bigDecimal);
                    info.setSpindlebeilvNumber(numberSizeList);
                    if (bigDecimal.compareTo(BigDecimal.ZERO) >0  && new BigDecimal(numberSizeList).compareTo(BigDecimal.ZERO) > 0) {
                        info.setSpindlebeilv(bigDecimal.divide(new BigDecimal(numberSizeList),4, RoundingMode.HALF_UP));
                        info.setSpindlebeilv(bigDecimal.divide(new BigDecimal(numberSizeList),2, RoundingMode.HALF_UP));
                    }
                }
                if (config.getChineseName().equals(feedbeilv)) {
                    info.setFeedbeilvValue(bigDecimal);
                    info.setFeedbeilvNumber(numberSizeList);
                    if (bigDecimal.compareTo(BigDecimal.ZERO) >0  && new BigDecimal(numberSizeList).compareTo(BigDecimal.ZERO) > 0) {
                        info.setFeedbeilv(bigDecimal.divide(new BigDecimal(numberSizeList),4, RoundingMode.HALF_UP));
                        info.setFeedbeilv(bigDecimal.divide(new BigDecimal(numberSizeList),2, RoundingMode.HALF_UP));
                    }
                }
            }

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

@@ -761,6 +761,31 @@
    }

    @Override
    public List<String> listEquipmentMagnificationId(MdcEquipmentMagnificationVo vo) {
        LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>();
        if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) {
            queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList());
        }
        if (StringUtils.isNotEmpty(vo.getEquipmentType())) {
            queryWrapper.in(MdcEquipment::getEquipmentType, Arrays.asList(vo.getEquipmentType().split(",")));
        }
        if (StringUtils.isNotEmpty(vo.getDeviceLevel())) {
            queryWrapper.in(MdcEquipment::getDeviceLevel, Arrays.asList(vo.getDeviceLevel().split(",")));
        }
        if (StringUtils.isNotEmpty(vo.getDriveType())) {
            queryWrapper.in(MdcEquipment::getDriveType, Arrays.asList(vo.getDriveType().split(",")));
        }
        if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
            queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
        }
        if (StringUtils.isNotBlank(vo.getAttribute())) {
            queryWrapper.eq(MdcEquipment::getAttribute, vo.getAttribute());
        }
        List<MdcEquipment> list = super.list(queryWrapper);
        return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
    }

    @Override
    public IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req) {
        if (StringUtils.isNotBlank(mdcEquipment.getProductionName())) {
            // é€’归查询所有子节点

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationBeilvVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.mdc.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class MdcEquipmentMagnificationBeilvVo {

    private BigDecimal spindlebeilv = new BigDecimal(0);
    //进给倍率平均值
    private BigDecimal feedbeilv = new BigDecimal(0);
    //有效日期
    @ApiModelProperty(value = "有效日期")
    private String theDate;

}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEquipmentMagnificationVo.java

@@ -31,4 +31,26 @@
     * è®¾å¤‡ids
     */
    private List<String> equipmentIdList;

    /**
     * è®¾å¤‡ç±»åž‹
     */
    private String equipmentType;

    /**
     * é©±åŠ¨ç±»åž‹
     */
    private String driveType;
    /**
     * è®¾å¤‡çº§åˆ«
     */
    private String deviceLevel;
    /**
     * è®¾å¤‡ç§ç±»
     */
    private String deviceCategory;
    /**
     * è®¾å¤‡å±žæ€§
     */
    private String attribute;
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationEquipmentVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
package org.jeecg.modules.mdc.vo;

import lombok.Data;
import org.jeecg.modules.mdc.dto.MdcEquipmentMagnificationDto;

import java.util.List;

@Data
public class MdcMagnificationEquipmentVo {
    private String level1;

    private String level2;

    private String level3;

    /**
     * è®¾å¤‡ç¼–码
     */
    private String equipmentId;
    /**
     * è®¾å¤‡åç§°
     */
    private String equipmentName;
    /**
     * è®¾å¤‡ç±»åž‹
     */
    private String equipmentType;

    private List<MdcEquipmentMagnificationDto> mdcBeilvVoList;
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcMagnificationVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.mdc.vo;

import lombok.Data;

import java.util.List;

@Data
public class MdcMagnificationVo {


    /**
     * å€çŽ‡æ•°æ®
     */
    private List<MdcMagnificationEquipmentVo> mdcMagnificationVos;

    private List<String> dates;
}