Merge pull request #49 from zhitan-cloud/develop1.0

ustcyc

2025-04-10 0e42180bd1244c23507e4c367f646fb7880c859f

Merge pull request #49 from zhitan-cloud/develop1.0

Develop1.0

 zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java

@@ -141,7 +141,7 @@
        List<ModelNodeIndexInfo> modelNodeIndexInfoList = energyIndexService.getModelNodeIndexInfoListByIndexIds(indexIds);
        if (ObjectUtils.isNotEmpty(modelNodeIndexInfoList)) {
            ModelNodeIndexInfo modelNodeIndexInfo = modelNodeIndexInfoList.stream().findFirst().get();
            return AjaxResult.error("指标 " + modelNodeIndexInfo.getIndexName() + " 已被模型 " + modelNodeIndexInfo.getModelName() + " 关联，不能删除！");
            return AjaxResult.error("采集指标 " + modelNodeIndexInfo.getIndexName() + " 已被模型 " + modelNodeIndexInfo.getModelName() + " 关联，不能删除！");
        }

        energyIndexService.removeEnergyIndex(indexIdList);
@@ -164,8 +164,9 @@
        // 查询模型节点点位信息
        List<ModelNodeIndexInfo> modelNodeIndexInfoList = energyIndexService.getModelNodeIndexInfoListByIndexIds(indexIds);
        if (ObjectUtils.isNotEmpty(modelNodeIndexInfoList)) {
            ModelNodeIndexInfo modelNodeIndexInfo = modelNodeIndexInfoList.stream().findFirst().get();
            return AjaxResult.error("指标 " + modelNodeIndexInfo.getIndexName() + " 已被模型 " + modelNodeIndexInfo.getModelName() + " 关联，不能删除！");
            if(modelNodeIndexInfoList.size() > 1){
                return AjaxResult.error("该统计指标已被其他模型关联，不能删除！");
            }
        }

        energyIndexService.removeEnergyIndex(indexIdList);