From fc6299c6de70eca8dcdaec270d3c8248e45a269a Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Sun, 25 Jun 2023 10:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/enums/AlgorithmResponseEnum.java | 2 ++ .../equipment/CsGroupController.java | 10 ++++++++++ .../njcn/csdevice/service/ICsGroupService.java | 6 ++++++ .../service/impl/CsDataArrayServiceImpl.java | 2 -- .../service/impl/CsGroupServiceImpl.java | 18 +++++++++++++++++- 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java index 75e1080..406216a 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java @@ -24,6 +24,8 @@ public enum AlgorithmResponseEnum { ELEEPDPQD_DATA_ERROR ("A00506","统计指标据数据缺失"), FILE_SIZE_ERROR ("A00507","文件不能超过10M"), + DATA_EXIST ("A00508","删除失败,有子数据"), + ; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java index 042a30d..98c84fd 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java @@ -74,5 +74,15 @@ public class CsGroupController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/deleteGroup") + @ApiOperation("删除分组") + @ApiImplicitParam(name = "groupId", value = "组id", required = true) + public HttpResult deleteGroup(@RequestParam("groupId") String groupId){ + String methodDescribe = getMethodDescribe("deleteGroup"); + csGroupService.deleteGroup(groupId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java index 57a8e6e..3e9db66 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java @@ -37,4 +37,10 @@ public interface ICsGroupService extends IService { */ IPage getDeviceHistoryData(EnergyBaseParam energyBaseParam); + /** + * 删除组信息 + * @param groupId 组id + */ + void deleteGroup(String groupId); + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java index d0fdd44..33220bb 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java @@ -1,7 +1,6 @@ package com.njcn.csdevice.service.impl; import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.mapper.CsDataArrayMapper; import com.njcn.csdevice.pojo.dto.DataArrayDTO; @@ -14,7 +13,6 @@ import com.njcn.system.pojo.po.EleEpdPqd; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import javax.validation.constraints.Min; import java.util.*; import java.util.stream.Collectors; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index 28dd9fa..ad565c1 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -2,9 +2,12 @@ package com.njcn.csdevice.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.mapper.CsDataArrayMapper; import com.njcn.csdevice.mapper.CsGroArrMapper; import com.njcn.csdevice.mapper.CsGroupMapper; @@ -16,7 +19,6 @@ import com.njcn.csdevice.pojo.vo.CsGroupVO; import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO; import com.njcn.csdevice.pojo.vo.EnergyTemplateVO; import com.njcn.csdevice.service.ICsDataArrayService; -import com.njcn.csdevice.service.ICsGroArrService; import com.njcn.csdevice.service.ICsGroupService; import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.influx.service.CommonService; @@ -157,6 +159,20 @@ public class CsGroupServiceImpl extends ServiceImpl impl return pageTurn; } + @Override + public void deleteGroup(String groupId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(CsGroArr::getGroupId,groupId); + List list = csGroArrMapper.selectList(lambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(list)){ + throw new BusinessException(AlgorithmResponseEnum.DATA_EXIST); + } else { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CsGroup::getId,groupId); + this.baseMapper.delete(wrapper); + } + } + private List getChildren(String tabId, List all) { return all.stream().filter(item -> item.getPid().equals(tabId)).collect(Collectors.toList()); }