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

设备监控实时数据相关接口调整(格式与前端不兼容)

Browse Source
This commit is contained in:
guofeihu
2024-07-26 13:56:39 +08:00
parent e27667c364
commit 777abc0824
13 changed files with 444 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import com.njcn.csdevice.pojo.vo.CsGroupVO;
import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
import com.njcn.csdevice.service.ICsGroupService;
import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
import com.njcn.csharmonic.pojo.vo.ThdDataVO;
import com.njcn.system.pojo.po.EleEpdPqd;
import com.njcn.system.pojo.vo.EleEpdPqdListVO;
@@ -95,11 +96,22 @@ public class CsGroupController extends BaseController {
@ApiOperation("查询实时数据中实时趋势")
@ApiImplicitParams({
@ApiImplicitParam(name = "devId", value = "设备ID", required = true),
@ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
@ApiImplicitParam(name = "lineId", value = "监测点id", required = true),
@ApiImplicitParam(name = "groupId", value = "指标分组ID", required = false)
})
public HttpResult<List<ThdDataVO>> getDeviceTrendData(@RequestParam("devId") String devId, @RequestParam(value = "lineId")String lineId){
public HttpResult<List<ThdDataTdVO>> getDeviceTrendData(@RequestParam("devId") String devId, @RequestParam(value = "lineId")String lineId,
@RequestParam(value = "groupId",required = false)String groupId){
String methodDescribe = getMethodDescribe("getDeviceTrendData");
List<ThdDataVO> list = csGroupService.getDeviceTrendData(devId,lineId);
List<ThdDataTdVO> list = csGroupService.getDeviceTrendData(devId,lineId,groupId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getDeviceTrendDataGroup")
@ApiOperation("查询实时数据中实时趋势中指标分组")
public HttpResult<List<ThdDataTdVO>> getDeviceTrendDataGroup(){
String methodDescribe = getMethodDescribe("getDeviceTrendDataGroup");
List<ThdDataTdVO> list = csGroupService.getDeviceTrendDataGroup();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@@ -107,9 +119,9 @@ public class CsGroupController extends BaseController {
@PostMapping("/getDeviceHarmonicSpectrumData")
@ApiOperation("查询实时数据中谐波频谱")
@ApiImplicitParam(name = "commonStatisticalQueryParam",required = true)
public HttpResult<List<ThdDataVO>> getDeviceHarmonicSpectrumData(@RequestBody CommonStatisticalQueryParam commonStatisticalQueryParam){
public HttpResult<List<ThdDataTdVO.ThdDataSpectrumVOData>> getDeviceHarmonicSpectrumData(@RequestBody CommonStatisticalQueryParam commonStatisticalQueryParam){
String methodDescribe = getMethodDescribe("getDeviceHarmonicSpectrumData");
List<ThdDataVO> list = csGroupService.getDeviceHarmonicSpectrumData(commonStatisticalQueryParam);
List<ThdDataTdVO.ThdDataSpectrumVOData> list = csGroupService.getDeviceHarmonicSpectrumData(commonStatisticalQueryParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}

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

@@ -19,7 +19,6 @@ import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.pojo.po.DictData;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.poi.ss.usermodel.Workbook;
@@ -27,8 +26,6 @@ import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -40,7 +37,7 @@ import java.util.stream.Stream;
/**
* <p>
* 便携式基础数据导入 前端控制器
* 离线数据导入 前端控制器
* </p>
*
* @author guofeihu
@@ -48,7 +45,7 @@ import java.util.stream.Stream;
*/
@RestController
@RequestMapping("/portableOfflLog")
@Api(tags = " 出厂设备")
@Api(tags = " 离线数据导入")
@AllArgsConstructor
public class PortableOfflLogController extends BaseController {
@@ -74,14 +71,14 @@ public class PortableOfflLogController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryPage")
@ApiOperation("便携式设备解析列表")
@ApiImplicitParam(name = "baseParam", value = "查询参数", required = true)
public HttpResult<Page<PortableOfflLog>> queryPage(@RequestBody BaseParam baseParam){
String methodDescribe = getMethodDescribe("queryPage");
Page<PortableOfflLog> list = iPortableOfflLogService.queryPage(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@ApiOperation("批量导入便携式设备信息")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("离线数据导入")
@PostMapping(value = "importEquipment")
public HttpResult<String> importEquipment(@RequestParam("devId") String devId
, @RequestParam("lineId") String lineId, @RequestParam("paths") String paths,HttpServletRequest request) {