修改

jinlin

2024-08-06 cd7b35b1acc7467deac78ba843b5870a22c9c7f6

 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,7 +157,6 @@
            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;
@@ -197,34 +185,11 @@
                    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);
@@ -414,13 +379,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);