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-05 16:38:14 +08:00
parent 815b90f47f
commit 33155a534f
9 changed files with 87 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,8 @@ 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.ThdDataVO;
import com.njcn.system.pojo.po.EleEpdPqd;
import com.njcn.system.pojo.vo.EleEpdPqdListVO;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -111,6 +113,15 @@ public class CsGroupController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getGroupPortableStatistical")
@ApiOperation("查询稳态指标并按照指标名称分组(A、B、...)")
public HttpResult<List<List<EleEpdPqd>>> getGroupPortableStatistical(){
String methodDescribe = getMethodDescribe("getGroupPortableStatistical");
List<List<EleEpdPqd>> list = csGroupService.getGroupPortableStatistical();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/deleteGroup")
@ApiOperation("删除分组")

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

@@ -12,7 +12,10 @@ import com.njcn.csdevice.pojo.param.WlRecordTemplete;
import com.njcn.csdevice.pojo.po.PortableOfflLog;
import com.njcn.csdevice.service.IPortableOfflLogService;
import com.njcn.csdevice.utils.ExcelStyleUtil;
import com.njcn.poi.excel.ExcelUtil;
import com.njcn.poi.util.PoiUtil;
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;
@@ -25,6 +28,9 @@ import com.njcn.web.controller.BaseController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* <p>
@@ -42,6 +48,8 @@ public class PortableOfflLogController extends BaseController {
private final IPortableOfflLogService iPortableOfflLogService;
private final DicDataFeignClient dicDataFeignClient;
@ResponseBody
@ApiOperation("导出设备基础数据模板")
@GetMapping(value = "getExcelTemplate")
@@ -49,8 +57,9 @@ public class PortableOfflLogController extends BaseController {
ExportParams exportParams = new ExportParams("批量导入模板（请严格按照模板标准填入数据,带*表示必填）", "便携式终端基础数据录入信息");
exportParams.setStyle(ExcelStyleUtil.class);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, WlRecordTemplete.class, new ArrayList<WlRecordTemplete>());
//ExcelUtil.selectList(workbook, 2, 2, Stream.of("直连设备","网关设备").collect(Collectors.toList()).toArray(new String[]{}));
//ExcelUtil.selectList(workbook, 4, 4, Stream.of("MQTT","CLD").collect(Collectors.toList()).toArray(new String[]{}));
ExcelUtil.selectList(workbook, 5, 5, Stream.of("1分钟","3分钟","5分钟","10分钟").collect(Collectors.toList()).toArray(new String[]{}));
ExcelUtil.selectList(workbook, 8, 8, Stream.of(dicDataFeignClient.getDicDataByTypeCode("Dev_Voltage").getData().stream().map(DictData::getName).collect(Collectors.toList())).collect(Collectors.toList()).get(0).toArray(new String[]{}));
ExcelUtil.selectList(workbook, 13, 13, Stream.of(dicDataFeignClient.getDicDataByTypeCode("Dev_Connect").getData().stream().map(DictData::getName).collect(Collectors.toList())).collect(Collectors.toList()).get(0).toArray(new String[]{}));
String fileName = "便携式设备模板.xlsx";
PoiUtil.exportFileByWorkbook(workbook, fileName, response);
return null;