修改

jinlin

2024-09-26 089b302259e03ce52fc102bcf168d1fa048fffe9

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

@@ -125,7 +125,6 @@
    }

    public List<Map<String, Object>> importProductExcel(MultipartFile mutFile, String progressId, Long shipId) {
        int count = 0;
        Date beginDate = new Date();
        List<Map<String, Object>> list = new ArrayList<>();//存储所有的导入状态
        Map<String, Object> map;//存储每一行的状态
@@ -145,16 +144,6 @@
        isOrNot.put("是", 1);
        isOrNot.put("否", 0);

        //获取是否有数据，如果有则删除数据
     /*   List<XhProductModel> productList = this.getByShipId(shipId);
        List<ParamData> dataList = paramDataService.getByShipId(shipId);
        if (productList.size() > 0) {
            this.deleteByShipId(shipId);
        }
        if (dataList.size() > 0) {
            paramDataService.deleteByShipId(shipId);
        }*/

        try {
            // 获取导入文件的后缀名
            String fileName = mutFile.getOriginalFilename();
@@ -168,10 +157,9 @@
            assert workbook != null; //断言如果[boolean表达式]为true，则程序继续执行。 如果为false，则程序抛出AssertionError，并终止执行。
            int sheets = workbook.getNumberOfSheets();

            //List<LifeManagement> lifeManagementList = new ArrayList<LifeManagement>();
            Long curXtId = null;
            Long curFxtId = null;
            Long curSbId = null;
            Long curSbId;
            String curXtName = "";
            String curFxtName = "";

@@ -197,54 +185,32 @@
                    insertSb = false;
                    CacheUtils.put(progressId, "speed", CommonUtils.getPercent(j, num));
                    CacheUtils.put(progressId, "msg", "共" + num + "行，已完成第" + j + "行");
                  /*  boolean isToggleXt = false;
                    boolean isToggleFxt = false;*/

                    row1 = j + 1;
                    String pattern = "yyyy-MM-dd";
                    Row row = sheet.getRow(row1);
                    String sort = com.zt.core.shiro.ImportUtil.getCellValue(row, 0, pattern); //序号
/*                    if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern))) {
                        if (!com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern).equals(xt)) {
                            isToggleXt = true;
                            xtId = UUIDUtil.generateId();
                        }
                        xt = com.zt.core.shiro.ImportUtil.getCellValue(row, 1, pattern); //系统
                    }

                    if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern)) && !isToggleXt) {
                        fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //分系统
                        fxtId = UUIDUtil.generateId();
                        isToggleFxt = true;
                    } else if (isToggleXt) {
                        if (StringUtils.isNotBlank(com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern))) {
                            fxt = com.zt.core.shiro.ImportUtil.getCellValue(row, 2, pattern); //分系统
                            fxtId = UUIDUtil.generateId();
                            isToggleFxt = true;
                        } else {
                            fxt = null;
                            isToggleFxt = true;
                        }
                    }*/

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

                    if (StringUtils.isBlank(sb))
                        continue;
@@ -289,6 +255,10 @@
                        paramId = modelMap.get(sbPath).getParamId();
                    }

                    if(StringUtils.isBlank(sameSbName)){
                        sameSbName = sb;
                    }

                    if (StringUtils.isEmpty(sb)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
                        continue;
@@ -316,7 +286,6 @@
                        ParamData itemEntity = new ParamData();
                        itemEntity.setShipId(shipId);
                        itemEntity.setProductId(curXtId);
                        itemEntity.setPageCode("expect");
                        paramDataService.insert(itemEntity);
                    }

@@ -336,21 +305,23 @@
                        ParamData itemEntity = new ParamData();
                        itemEntity.setShipId(shipId);
                        itemEntity.setProductId(curFxtId);
                        itemEntity.setPageCode("expect");
                        paramDataService.insert(itemEntity);
                    }

                    xhProductModel.setPid(curFxtId == null ? curXtId : curFxtId);
                    xhProductModel.setId(curSbId);
                    xhProductModel.setName(sb);
                    xhProductModel.setSameSbName(sameSbName);
                    xhProductModel.setEquipType(equipType);
                    xhProductModel.setProductType("5");
                    xhProductModel.setSort(Integer.valueOf(sort));
                    defultImg = sysPictureBaseService.getDefaultImg(5).getId();
                    xhProductModel.setOperatImg(defultImg);
                    xhProductModel.setNamePath(sbPath);
                    if (insertSb) {
                        xhProductModel.setPid(curFxtId == null ? curXtId : curFxtId);
                        xhProductModel.setId(curSbId);
                        xhProductModel.setName(sb);
                        xhProductModel.setEquipType(equipType);
                        xhProductModel.setProductType("5");
                        xhProductModel.setSort(Integer.valueOf(sort));
                        defultImg = sysPictureBaseService.getDefaultImg(5).getId();
                        xhProductModel.setOperatImg(defultImg);
                        xhProductModel.setNamePath(sbPath);
                        this.insert(xhProductModel);
                    }else{
                        this.update(xhProductModel);
                    }

                    //导入预计参数
@@ -358,7 +329,6 @@
                    //绑定设备ID
                    itemEntity.setShipId(shipId);
                    itemEntity.setProductId(curSbId);
                    itemEntity.setPageCode("expect");
                    itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
                    itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
                    if (StringUtils.isNotBlank(basicMtbfRegulate)) {
@@ -414,13 +384,7 @@
            ImportUtil.updateErrMap(errMap, "导入异常" + e.getMessage(), "", row1);
            //err++;
        }
      /*  if (batchList.size() > 0 && err == 0) {
            super.insertBatch(batchList, 100);
            baseDao.updateOldId();
        }
        if (batchUpdateList.size() > 0) {
            super.updateBatch(batchUpdateList, 100);
        }*/

        Date nowDate = new Date();
        String msg = "产品模型导入时间：" + CommonUtils.getDatePoor(nowDate, beginDate) + "\r\n";
        System.out.println(msg);
@@ -434,11 +398,19 @@
        return list;
    }

    private void deleteByShipId(Long shipId) {
    public void deleteByShipId(Long shipId) {
        baseDao.deleteByShipId(shipId);
    }

    private List<XhProductModel> getByShipId(Long shipId) {
        return baseDao.getByShipId(shipId);
    }

    public void deleteByPid(Long id) {
        baseDao.deleteByPid(id);
    }

    public Long[] getByPid(Long id) {
        return baseDao.getByPid(id);
    }
}