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 7c3c1cb..772cf2c 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 @@ -28,7 +28,7 @@ public enum AlgorithmResponseEnum { LOSE_EFFICACY ("A00509","二维码失效，该设备已绑定"), DATA_LOSE ("A00510","未找到设备与主用户信息"), REPEAT_SHARE ("A00511","设备已分享完成,请勿再次分享"), - + DEVICE_LOSE("A00512","设备id缺失") ; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java index dba6d1a..6d60fd7 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java @@ -43,6 +43,17 @@ public class CsTouristDataPOController extends BaseController { Boolean flag = csTouristDataPOService.add(csTouristDataParms); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/remove") + @ApiOperation("移除游客数据") + @ApiImplicitParam(name = "csTouristDataParms", value = "新增工程参数", required = true) + public HttpResult remove(@Validated @RequestBody List csTouristDataParms){ + String methodDescribe = getMethodDescribe("remove"); + + Boolean flag = csTouristDataPOService.remove(csTouristDataParms); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryAll") @ApiOperation("查询游客数据") diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java index 564e84f..75463d2 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java @@ -21,4 +21,6 @@ public interface CsTouristDataPOService extends IService{ Boolean add(List csTouristDataParms); List queryAll(); + + Boolean remove(List csTouristDataParms); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java index a88b84d..603e8c8 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java @@ -65,11 +65,11 @@ public class RoleEngineerDevService { if(CollectionUtils.isEmpty(collect1)){ return collect; }else{ - csLedgerQueryWrapper.in("id",collect1); + csLedgerQueryWrapper.in("id",collect1).eq("level",2); List csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper); List collect2 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList()); csLedgerQueryWrapper.clear(); - csLedgerQueryWrapper.in("id",collect2); + csLedgerQueryWrapper.in("id",collect2).eq("level",1); csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper); List collect3 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList()); collect.addAll(collect3); @@ -83,7 +83,7 @@ public class RoleEngineerDevService { List csTouristDataPOS = csTouristDataPOMapper.selectList(null); collect = csTouristDataPOS.stream().map(CsTouristDataPO::getEnginerId).distinct().collect(Collectors.toList()); - }else{ + }else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())){ List csEngineeringPOS = csEngineeringMapper.selectList(null); collect =csEngineeringPOS.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()); } @@ -92,6 +92,8 @@ public class RoleEngineerDevService { } public List getDevice(){ String role = RequestUtil.getUserRole(); + List strings = JSONArray.parseArray(role, String.class); + role=strings.get(0); String userIndex = RequestUtil.getUserIndex(); QueryWrapper csEngineeringUserPOQueryWrapper = new QueryWrapper<> (); QueryWrapper csDeviceUserPOQueryWrapper = new QueryWrapper<>(); @@ -121,14 +123,14 @@ public class RoleEngineerDevService { List csTouristDataPOS = csTouristDataPOMapper.selectList(null); collect = csTouristDataPOS.stream().map(CsTouristDataPO::getDeviceId).distinct().collect(Collectors.toList()); - }else{ + }else if(Objects.equals(role,AppRoleEnum.ROOT.getCode())||Objects.equals(role,AppRoleEnum.OPERATION_MANAGER.getCode())){ csLedgerQueryWrapper.clear(); csLedgerQueryWrapper.eq("level",2).eq("state",1); List csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper); collect = csLedgers.stream().map(CsLedger::getId).distinct().collect(Collectors.toList()); - } + return collect; } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTouristDataPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTouristDataPOServiceImpl.java index 7dcb26d..a596978 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTouristDataPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsTouristDataPOServiceImpl.java @@ -1,6 +1,9 @@ package com.njcn.csdevice.service.impl; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.param.CsTouristDataParm; import com.njcn.csdevice.pojo.vo.CsTouristDataParmVO; import org.springframework.beans.BeanUtils; @@ -9,6 +12,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.pojo.po.CsTouristDataPO; @@ -53,4 +57,17 @@ public class CsTouristDataPOServiceImpl extends ServiceImpl result = this.getBaseMapper().queryAll(); return result; } + + @Override + @Transactional(rollbackFor = {Exception.class}) + public Boolean remove(List csTouristDataParms) { + List collect = csTouristDataParms.stream().map(CsTouristDataParm::getDeviceId).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)){ + throw new BusinessException(AlgorithmResponseEnum.DEVICE_LOSE); + } + QueryWrapper QueryWrapper = new QueryWrapper<>(); + QueryWrapper.in(CsTouristDataPO.COL_DEVICE_ID,collect); + boolean remove = this.remove(QueryWrapper); + return remove; + } }