地质所 沉降监测网建设项目
suerwei
2024-05-17 b007f76a4165aac2cbb4ba7725b0ea9d4914efc3
钻孔导入功能_1
1个文件已修改
77 ■■■■ 已修改文件
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java
@@ -110,44 +110,43 @@
     */
    @Override
    public int deleteHoleByIds(String ids) {
        // 批量删除钻孔下面的关联数据
        String[] strings = Convert.toStrArray(ids);
        if (!ObjectUtils.isEmpty(strings)) {
            for (String holeId : strings) {
                // =======标贯==========
                List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByHoleId(holeId);
                String[] biaoguanIds = biaoguans.stream().map(HoleBiaoguan::getIds).toArray(String[]::new);
                // =======回次==========
                List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByHoleId(holeId);
                String[] huiCiIds = holeHuicis.stream().map(HoleHuici::getIds).toArray(String[]::new);
                // =======人员==========
                List<HolePerson> persons = holePersonMapper.selectHolePersonByHoleId(holeId);
                String[] personIds = persons.stream().map(HolePerson::getIds).toArray(String[]::new);
                // =======取土==========
                List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByHoleId(holeId);
                String[] qutuIds = qutus.stream().map(HoleQutu::getIds).toArray(String[]::new);
                // =======水位==========
                List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByHoleId(holeId);
                String[] shuiweiIds = shuiweis.stream().map(HoleShuiwei::getIds).toArray(String[]::new);
                // =======岩土==========
                List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuListByHoleId(holeId);
                String[] yantusIds = yantus.stream().map(HoleYantu::getIds).toArray(String[]::new);
                holeBiaoguanMapper.deleteHoleBiaoguanByIds(biaoguanIds);
                holeHuiciMapper.deleteHoleHuiciByIds(huiCiIds);
                holePersonMapper.deleteHolePersonByIds(personIds);
                holeQutuMapper.deleteHoleQutuByIds(qutuIds);
                holeShuiweiMapper.deleteHoleShuiweiByIds(shuiweiIds);
                holeYantuMapper.deleteHoleYantuByIds(yantusIds);
            }
        }
//        String[] strings = Convert.toStrArray(ids);
//        if (!ObjectUtils.isEmpty(strings)) {
//            for (String holeId : strings) {
//
//                // =======标贯==========
//                List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByHoleId(holeId);
//                String[] biaoguanIds = biaoguans.stream().map(HoleBiaoguan::getIds).toArray(String[]::new);
//
//                // =======回次==========
//                List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByHoleId(holeId);
//                String[] huiCiIds = holeHuicis.stream().map(HoleHuici::getIds).toArray(String[]::new);
//
//                // =======人员==========
//                List<HolePerson> persons = holePersonMapper.selectHolePersonByHoleId(holeId);
//                String[] personIds = persons.stream().map(HolePerson::getIds).toArray(String[]::new);
//
//                // =======取土==========
//                List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByHoleId(holeId);
//                String[] qutuIds = qutus.stream().map(HoleQutu::getIds).toArray(String[]::new);
//
//                // =======水位==========
//                List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByHoleId(holeId);
//                String[] shuiweiIds = shuiweis.stream().map(HoleShuiwei::getIds).toArray(String[]::new);
//
//                // =======岩土==========
//                List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuListByHoleId(holeId);
//                String[] yantusIds = yantus.stream().map(HoleYantu::getIds).toArray(String[]::new);
//
//                holeBiaoguanMapper.deleteHoleBiaoguanByIds(biaoguanIds);
//                holeHuiciMapper.deleteHoleHuiciByIds(huiCiIds);
//                holePersonMapper.deleteHolePersonByIds(personIds);
//                holeQutuMapper.deleteHoleQutuByIds(qutuIds);
//                holeShuiweiMapper.deleteHoleShuiweiByIds(shuiweiIds);
//                holeYantuMapper.deleteHoleYantuByIds(yantusIds);
//            }
//        }
        return holeMapper.deleteHoleByIds(Convert.toStrArray(ids));
    }
@@ -171,10 +170,12 @@
        try {
            String dest = saveExcel(file);
            List<Hole> list = readData(dest);
            if(!ObjectUtils.isEmpty(list)){
            for (Hole item : list) {
                    item.setProjectId(projectId);
                insertHole(item);
            }
            }
        } catch (Exception e) {
            return e.toString();
        }