diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java index 0cf184b..88402ef 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java @@ -1,12 +1,16 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.NoiseRequest; import com.casic.missiles.modular.system.dto.ReturnDTO; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Noise; import com.casic.missiles.modular.system.service.INoiseService; import com.casic.missiles.modular.system.util.ReturnUtil; @@ -15,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; +import java.util.Objects; /** * 相关仪上传数据控制器 @@ -37,11 +43,22 @@ public ReturnDTO> list(@RequestBody NoiseRequest noiseRequest) { Page page = PageFactory.defaultPage(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(ObjectUtil.isNotEmpty(noiseRequest.getKeywords()),"devcode",noiseRequest.getKeywords()); + queryWrapper.select("ID", "DEVCODE", "DDATA", "UPTIME", "LOGTIME", "pci", "rsrp", "snr"); + queryWrapper.like(ObjectUtil.isNotEmpty(noiseRequest.getKeywords()), "devcode", noiseRequest.getKeywords()); queryWrapper.ge(ObjectUtil.isNotEmpty(noiseRequest.getBeginTime()), "UPTIME", noiseRequest.getBeginTime()); queryWrapper.le(ObjectUtil.isNotEmpty(noiseRequest.getEndTime()), "UPTIME", noiseRequest.getEndTime()); queryWrapper.orderByDesc("UPTIME"); - return ReturnUtil.success(super.packForBT(noiseService.page( page,queryWrapper))); + return ReturnUtil.success(super.packForBT(noiseService.page(page, queryWrapper))); + } + + @ApiOperation("根据id查询3750个点数据") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Noise noise = noiseService.getById(idDTO.getId()); + return ReturnUtil.success(noise != null ? noise.getRawData() : ""); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java index 0cf184b..88402ef 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/NoiseController.java @@ -1,12 +1,16 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.modular.system.dto.IdDTO; import com.casic.missiles.modular.system.dto.NoiseRequest; import com.casic.missiles.modular.system.dto.ReturnDTO; +import com.casic.missiles.modular.system.enums.BusinessExceptionEnum; +import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.model.Noise; import com.casic.missiles.modular.system.service.INoiseService; import com.casic.missiles.modular.system.util.ReturnUtil; @@ -15,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; +import java.util.Objects; /** * 相关仪上传数据控制器 @@ -37,11 +43,22 @@ public ReturnDTO> list(@RequestBody NoiseRequest noiseRequest) { Page page = PageFactory.defaultPage(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(ObjectUtil.isNotEmpty(noiseRequest.getKeywords()),"devcode",noiseRequest.getKeywords()); + queryWrapper.select("ID", "DEVCODE", "DDATA", "UPTIME", "LOGTIME", "pci", "rsrp", "snr"); + queryWrapper.like(ObjectUtil.isNotEmpty(noiseRequest.getKeywords()), "devcode", noiseRequest.getKeywords()); queryWrapper.ge(ObjectUtil.isNotEmpty(noiseRequest.getBeginTime()), "UPTIME", noiseRequest.getBeginTime()); queryWrapper.le(ObjectUtil.isNotEmpty(noiseRequest.getEndTime()), "UPTIME", noiseRequest.getEndTime()); queryWrapper.orderByDesc("UPTIME"); - return ReturnUtil.success(super.packForBT(noiseService.page( page,queryWrapper))); + return ReturnUtil.success(super.packForBT(noiseService.page(page, queryWrapper))); + } + + @ApiOperation("根据id查询3750个点数据") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Noise noise = noiseService.getById(idDTO.getId()); + return ReturnUtil.success(noise != null ? noise.getRawData() : ""); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/IdDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/IdDTO.java new file mode 100644 index 0000000..e2009f5 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/IdDTO.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: for delete/detail use + */ +@Data +public class IdDTO { + @NotNull(message = "主键ID不能为空") + @ApiModelProperty(value = "主键id", dataType = "Long", required = true) + private Long id; +}