Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -61,23 +61,43 @@
        super.deleteLogic(ids);
    }

    public List<XhProductModel> getAllTree(Boolean showXdy, Integer ztShow) {
    public List<XhProductModel> getAllTree(Boolean showXdy, Integer ztShow, Long productId) {
        List<XhProductModel> productList = null;
        if (showXdy) {
            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                    Constant.Bool.NO).lt("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
        } else {
            if (ztShow == 1) {
            if (productId != null) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            } else if (ztShow == 2) {
                        Constant.Bool.NO).ne("product_type", 5).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
            } else {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            } else if (ztShow == 3) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                        Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
            }

        } else {
            if (productId == null) {
                if (ztShow == 1) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 2) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 3) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 4) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 5) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
                }
            } else {
                if (ztShow == 4) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 5) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).gt("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
                }
            }
        }
        return TreeUtils.build(productList);
    }
@@ -131,7 +151,7 @@
        if (productList.size() > 0) {
            this.deleteByShipId(shipId);
        }
        if (dataList.size()>0){
        if (dataList.size() > 0) {
            paramDataService.deleteByShipId(shipId);
        }

@@ -169,7 +189,6 @@
                for (int j = 1; j <= num; j++) {
                    CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
                    CacheUtils.put(progressId, "msg", "共" + num + "行，已完成第" + j + "行");
                    DictTypeDto lifeManagement = new DictTypeDto();
                    boolean isToggleXt = false;
                    boolean isToggleFxt = false;
                    row1 = j + 1;
@@ -200,46 +219,29 @@
                    }

                    String sb = com.zt.core.shiro.ImportUtil.getCellValue(row, 3, pattern); //设备
                    String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //可靠性分布类型
                    String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //参加计算
                    String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //mtbf
                    String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //成功率
                    String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //运行比
                    String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //mtbcf
                    String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf其他参数2
                    String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf其他参数3
                    String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf成功率
                    String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf运行比
                    String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //是否可维修
                    String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //维修发布类型
                    String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //mttcr
                    String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr其他参数2
                    String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr其他参数3
                    String equipType = com.zt.core.shiro.ImportUtil.getCellValue(row, 4, pattern); //设备类型
                    String reliabDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 5, pattern); //可靠性分布类型
                    String basicJoinCompute = com.zt.core.shiro.ImportUtil.getCellValue(row, 6, pattern); //参加计算
                    String basicMtbfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 7, pattern); //mtbf
                    String basicMtbfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 8, pattern); //成功率
                    String basicMtbfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 9, pattern); //运行比
                    String taskMtbcfRegulate = com.zt.core.shiro.ImportUtil.getCellValue(row, 10, pattern); //mtbcf
                    String taskMtbcfOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 11, pattern); //mtbcf其他参数2
                    String taskMtbcfOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 12, pattern); //mtbcf其他参数3
                    String taskMtbcfRegulSuccRate = com.zt.core.shiro.ImportUtil.getCellValue(row, 13, pattern); //mtbcf成功率
                    String taskMtbcfOperatingRatio = com.zt.core.shiro.ImportUtil.getCellValue(row, 14, pattern); //mtbcf运行比
                    String repairable = com.zt.core.shiro.ImportUtil.getCellValue(row, 15, pattern); //是否可维修
                    String repairDistribType = com.zt.core.shiro.ImportUtil.getCellValue(row, 16, pattern); //维修发布类型
                    String repairMttcr = com.zt.core.shiro.ImportUtil.getCellValue(row, 17, pattern); //mttcr
                    String repairMttcrOtherParams2 = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr其他参数2
                    String repairMttcrOtherParams3 = com.zt.core.shiro.ImportUtil.getCellValue(row, 19, pattern); //mttcr其他参数3

                    if (StringUtils.isEmpty(sb)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(reliabDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写可靠性分布类型", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(basicJoinCompute)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否参加计算", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(repairable)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否可维修", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isNotBlank(repairable) && StringUtils.isEmpty(repairDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "有未填写的维修分布类型", sheetName, row1);
                        continue;
                    }

                    //导入型号产品结果库
                    XhProductModel xhProductModel = new XhProductModel();


                    Long defultImg = null;
                    xhProductModel.setShipId(shipId);
@@ -290,6 +292,7 @@
                    }
                    xhProductModel.setId(sbId);
                    xhProductModel.setName(sb);
                    xhProductModel.setEquipType(equipType);
                    xhProductModel.setProductType("5");
                    xhProductModel.setSort(Integer.valueOf(sort));
                    defultImg = sysPictureBaseService.getDefaultImg(5).getId();
@@ -304,39 +307,43 @@
                    itemEntity.setPageCode("expect");
                    itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
                    itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
                    if (StringUtils.isNotBlank(basicMtbfRegulate)){
                    if (StringUtils.isNotBlank(basicMtbfRegulate)) {
                        itemEntity.setBasicMtbfRegulate(Double.valueOf(basicMtbfRegulate));
                    }
                    if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)){
                    if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)) {
                        itemEntity.setBasicMtbfRegulSuccRate(Double.valueOf(basicMtbfRegulSuccRate));
                    }
                    if (StringUtils.isNotBlank(basicMtbfOperatingRatio)){
                    if (StringUtils.isNotBlank(basicMtbfOperatingRatio)) {
                        itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
                    } else {
                        itemEntity.setBasicMtbfOperatingRatio(1.0);
                    }
                    if (StringUtils.isNotBlank(taskMtbcfRegulate)){
                    if (StringUtils.isNotBlank(taskMtbcfRegulate)) {
                        itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams2)){
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams2)) {
                        itemEntity.setTaskMtbcfOtherParams2(Double.valueOf(taskMtbcfOtherParams2));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams3)){
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams3)) {
                        itemEntity.setTaskMtbcfOtherParams3(Double.valueOf(taskMtbcfOtherParams3));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)){
                    if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)) {
                        itemEntity.setTaskMtbcfRegulSuccRate(Double.valueOf(taskMtbcfRegulSuccRate));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)){
                    if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)) {
                        itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
                    } else {
                        itemEntity.setTaskMtbcfOperatingRatio(1.0);
                    }
                    itemEntity.setRepairable(isOrNot.get(repairable));
                    itemEntity.setRepairDistribType(repairType.get(repairDistribType));
                    if (StringUtils.isNotBlank(repairMttcr)){
                    if (StringUtils.isNotBlank(repairMttcr)) {
                        itemEntity.setRepairMttcr(Double.valueOf(repairMttcr));
                    }
                    if (StringUtils.isNotBlank(repairMttcrOtherParams2)){
                    if (StringUtils.isNotBlank(repairMttcrOtherParams2)) {
                        itemEntity.setRepairMttcrOtherParams2(Double.valueOf(repairMttcrOtherParams2));
                    }
                    if (StringUtils.isNotBlank(repairMttcrOtherParams3)){
                    if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
                        itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
                    }
                    paramDataService.insert(itemEntity);