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-07-05 16:15:36 +08:00
parent 9a112bb384
commit 071a383089
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,6 +79,7 @@ public class CsGroupController extends BaseController {
@PostMapping("/deleteGroup") @PostMapping("/deleteGroup")
@ApiOperation("删除分组") @ApiOperation("删除分组")
@ApiImplicitParam(name = "groupId", value = "组id", required = true) @ApiImplicitParam(name = "groupId", value = "组id", required = true)
@Deprecated
public HttpResult<String> deleteGroup(@RequestParam("groupId") String groupId){ public HttpResult<String> deleteGroup(@RequestParam("groupId") String groupId){
String methodDescribe = getMethodDescribe("deleteGroup"); String methodDescribe = getMethodDescribe("deleteGroup");
csGroupService.deleteGroup(groupId); csGroupService.deleteGroup(groupId);

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

@@ -73,7 +73,7 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
@Override @Override
public CsDevModelPO findModel(String devType, String version, String time) { public CsDevModelPO findModel(String devType, String version, String time) {
LambdaQueryWrapper<CsDevModelPO> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CsDevModelPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(CsDevModelPO::getDevType,devType) lambdaQueryWrapper.eq(CsDevModelPO::getDevTypeName,devType)
.eq(CsDevModelPO::getVersionNo,version) .eq(CsDevModelPO::getVersionNo,version)
.eq(CsDevModelPO::getVersionDate, LocalDateTime.parse(time, DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))) .eq(CsDevModelPO::getVersionDate, LocalDateTime.parse(time, DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)))
.eq(CsDevModelPO::getStatus,1); .eq(CsDevModelPO::getStatus,1);

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.mapper.CsGroArrMapper; import com.njcn.csdevice.mapper.CsGroArrMapper;
import com.njcn.csdevice.mapper.CsGroupMapper;
import com.njcn.csdevice.pojo.param.GroupArrParam; import com.njcn.csdevice.pojo.param.GroupArrParam;
import com.njcn.csdevice.pojo.po.CsGroArr; import com.njcn.csdevice.pojo.po.CsGroArr;
import com.njcn.csdevice.pojo.po.CsGroup; import com.njcn.csdevice.pojo.po.CsGroup;
@@ -34,6 +35,8 @@ public class CsGroArrServiceImpl extends ServiceImpl<CsGroArrMapper, CsGroArr> i
private final ICsGroupService csGroupService; private final ICsGroupService csGroupService;
private final CsGroupMapper csGroupMapper;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateGroArr(GroupArrParam groupArrParam) { public void updateGroArr(GroupArrParam groupArrParam) {
@@ -42,10 +45,14 @@ public class CsGroArrServiceImpl extends ServiceImpl<CsGroArrMapper, CsGroArr> i
if(CollectionUtil.isNotEmpty(list)) { if(CollectionUtil.isNotEmpty(list)) {
List<CsGroup> listGroup = new ArrayList<>(); List<CsGroup> listGroup = new ArrayList<>();
List<CsGroArr> arrList = new ArrayList<>(); List<CsGroArr> arrList = new ArrayList<>();
List<String> groupIdList = list.stream().map(GroupArrParam.ArrItem::getId).collect(Collectors.toList()); LambdaQueryWrapper<CsGroup> csGroupLambdaQueryWrapper = new LambdaQueryWrapper<>();
csGroupLambdaQueryWrapper.eq(CsGroup::getDataSetId,groupArrParam.getSetId());
List<CsGroup> csGroupList = csGroupMapper.selectList(csGroupLambdaQueryWrapper);
List<String> groupIdList = csGroupList.stream().map(CsGroup::getId).collect(Collectors.toList());
LambdaQueryWrapper<CsGroArr> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CsGroArr> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(CsGroArr::getGroupId, groupIdList); lambdaQueryWrapper.in(CsGroArr::getGroupId, groupIdList);
this.baseMapper.delete(lambdaQueryWrapper); this.baseMapper.delete(lambdaQueryWrapper);
csGroupMapper.delete(csGroupLambdaQueryWrapper);
Integer sort = 0; Integer sort = 0;
for (GroupArrParam.ArrItem item : list) { for (GroupArrParam.ArrItem item : list) {