Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除组功能

Browse Source
This commit is contained in:
xuyang
2023-06-25 10:33:05 +08:00
parent 4a727b2fae
commit fc6299c6de
5 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java
View File

@@ -24,6 +24,8 @@ public enum AlgorithmResponseEnum {
ELEEPDPQD_DATA_ERROR ("A00506","统计指标据数据缺失"),
FILE_SIZE_ERROR ("A00507","文件不能超过10M"),
DATA_EXIST ("A00508","删除失败,有子数据"),
;

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java
View File

@@ -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<String> deleteGroup(@RequestParam("groupId") String groupId){
String methodDescribe = getMethodDescribe("deleteGroup");
csGroupService.deleteGroup(groupId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java
View File

@@ -37,4 +37,10 @@ public interface ICsGroupService extends IService<CsGroup> {
*/
IPage<DataGroupTemplateVO> getDeviceHistoryData(EnergyBaseParam energyBaseParam);
/**
* 删除组信息
* @param groupId 组id
*/
void deleteGroup(String groupId);
}

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
View File

@@ -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;

18
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
View File

@@ -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<CsGroupMapper, CsGroup> impl
return pageTurn;
}
@Override
public void deleteGroup(String groupId) {
LambdaQueryWrapper<CsGroArr> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(CsGroArr::getGroupId,groupId);
List<CsGroArr> list = csGroArrMapper.selectList(lambdaQueryWrapper);
if (CollectionUtil.isNotEmpty(list)){
throw new BusinessException(AlgorithmResponseEnum.DATA_EXIST);
} else {
LambdaQueryWrapper<CsGroup> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CsGroup::getId,groupId);
this.baseMapper.delete(wrapper);
}
}
private List<EnergyTemplateVO> getChildren(String tabId, List<EnergyTemplateVO> all) {
return all.stream().filter(item -> item.getPid().equals(tabId)).collect(Collectors.toList());
}