From 86ad89d06c7a5eb9010c55e9878f258bfb376678 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Mon, 23 Sep 2024 10:48:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=97=A0=E7=BA=BFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledger/CommTerminalController.java | 65 +++++ .../controller/line/CslineController.java | 13 + .../njcn/csdevice/mapper/OverlimitMapper.java | 18 ++ .../csdevice/mapper/PqsDeviceUnitMapper.java | 13 + .../impl/CsEquipmentDeliveryServiceImpl.java | 10 +- .../service/impl/CsGroupServiceImpl.java | 16 +- .../service/impl/CsLedgerServiceImpl.java | 4 +- .../controller/CsCustomReportController.java | 269 ++++++++++++++++++ 8 files changed, 396 insertions(+), 12 deletions(-) create mode 100644 cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CommTerminalController.java create mode 100644 cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java create mode 100644 cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/PqsDeviceUnitMapper.java create mode 100644 cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsCustomReportController.java diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CommTerminalController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CommTerminalController.java new file mode 100644 index 0000000..64a5318 --- /dev/null +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CommTerminalController.java @@ -0,0 +1,65 @@ +package com.njcn.csdevice.controller.ledger; + + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.csdevice.mapper.PqsDeviceUnitMapper; +import com.njcn.device.biz.pojo.po.PqsDeviceUnit; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + + +/** + * @author wr + * @description + * @date 2023/4/26 10:00 + */ +@RestController +@RequestMapping("/commTerminal") +@RequiredArgsConstructor +@Slf4j +@Api(tags = "通用台账查询") +public class CommTerminalController extends BaseController { + + private final PqsDeviceUnitMapper pqsDeviceUnitMapper; + + + + /** + * 通过监测点获取监测点数据单位 + * @author cdf + * @date 2023/9/21 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/lineUnitDetail") + @ApiOperation("根据监测点id获取数据单位") + @ApiImplicitParam(name = "lineId", value = "实体", required = true) + public HttpResult lineUnitDetail(@RequestParam("lineId") String lineId) { + String methodDescribe = getMethodDescribe("lineUnitDetail"); + + PqsDeviceUnit pqsDeviceUnit = pqsDeviceUnitMapper.selectById(lineId); + if(Objects.isNull(pqsDeviceUnit)){ + pqsDeviceUnit = new PqsDeviceUnit(); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqsDeviceUnit, methodDescribe); + } + + + + + + + + +} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java index 3227625..def7774 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java @@ -5,15 +5,19 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.csdevice.mapper.OverlimitMapper; import com.njcn.csdevice.pojo.param.CsLineParam; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.service.CsLinePOService; +import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -36,6 +40,8 @@ public class CslineController extends BaseController { private final CsLinePOService csLinePOService; + private final OverlimitMapper overlimitMapper; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryLineById") @ApiOperation("监测点查询通过id获取") @@ -70,9 +76,16 @@ public class CslineController extends BaseController { @PostMapping("/addList") @ApiOperation("批量新增监测点") @ApiImplicitParam(name = "list", value = "监测点数据集", required = true) + @Transactional(rollbackFor = Exception.class) public HttpResult addLineList(@RequestBody List list){ String methodDescribe = getMethodDescribe("addLineList"); csLinePOService.saveBatch(list); + for(CsLinePO csLinePO: list){ + Overlimit overlimit = COverlimitUtil.globalAssemble(csLinePO.getVolGrade().floatValue(),10f,10f,10f,0,1); + overlimit.setId(csLinePO.getLineId()); + overlimitMapper.deleteById(csLinePO.getLineId()); + overlimitMapper.insert(overlimit); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java new file mode 100644 index 0000000..011903d --- /dev/null +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java @@ -0,0 +1,18 @@ +package com.njcn.csdevice.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.biz.pojo.po.Overlimit; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2022-01-04 + */ +public interface OverlimitMapper extends BaseMapper { + +} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/PqsDeviceUnitMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/PqsDeviceUnitMapper.java new file mode 100644 index 0000000..0679eed --- /dev/null +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/PqsDeviceUnitMapper.java @@ -0,0 +1,13 @@ +package com.njcn.csdevice.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.biz.pojo.po.PqsDeviceUnit; + +/** + * pqs + * + * @author cdf + * @date 2024/8/21 + */ +public interface PqsDeviceUnitMapper extends BaseMapper { +} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index ada272d..b17ad4b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -346,7 +346,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl impl List result = new ArrayList(); List data1 = equipmentFeignClient.queryDeviceById(Stream.of(commonStatisticalQueryParam.getDevId()).collect(Collectors.toList())).getData(); List finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(commonStatisticalQueryParam.getLineId())).getData(); - if(commonStatisticalQueryParam.getList() != null && commonStatisticalQueryParam.getList().size() > 0){ + if(CollectionUtil.isNotEmpty(commonStatisticalQueryParam.getList())){ for (CommonStatisticalQueryParam param : commonStatisticalQueryParam.getList()){ - if(param.getStatisticalId() == null){ - continue; - } + List eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData(); eleEpdPqds.forEach(epdPqd->{ List commonQueryParams = finalCsLinePOList.stream().map(temp -> { @@ -306,15 +306,19 @@ public class CsGroupServiceImpl extends ServiceImpl impl commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId())); commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency())); commonQueryParam.setPhasic(epdPqd.getPhase()); + + commonQueryParam.setStartTime(DateUtil.format(DateUtil.beginOfMonth(new Date()), DatePattern.NORM_DATETIME_PATTERN)); + commonQueryParam.setEndTime(DateUtil.format(DateUtil.date(), DatePattern.NORM_DATETIME_PATTERN)); //commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime()); + //commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime()); commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType()); commonQueryParam.setProcess(data1.get(0).getProcess()+""); commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId())); return commonQueryParam; }).collect(Collectors.toList()); - //List deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams); - List deviceRtData = commonService.getDeviceRtData(commonQueryParams); + List deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams); + //List deviceRtData = commonService.getDeviceRtData(commonQueryParams); List collect1 = deviceRtData.stream().map(temp -> { ThdDataVO vo = new ThdDataVO(); vo.setLineId(temp.getLineId()); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 4eaaf0e..2a7bd03 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -110,7 +110,9 @@ public class CsLedgerServiceImpl extends ServiceImpl i c.setPid(portable.getId()); CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(c.getId()); c.setComFlag(csEquipmentDeliveryPO.getRunStatus()); - c.setChildren(wlRecordMapper.getAllLine(c.getId())); + List csLedgerVOList = wlRecordMapper.getAllLine(c.getId()); + csLedgerVOList.forEach(item->item.setComFlag(c.getComFlag())); + c.setChildren(csLedgerVOList); for(CsLedgerVO cs : c.getChildren()){ cs.setPid(c.getId()); cs.setLevel(3); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsCustomReportController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsCustomReportController.java new file mode 100644 index 0000000..ecc7690 --- /dev/null +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsCustomReportController.java @@ -0,0 +1,269 @@ +//package com.njcn.csharmonic.controller; +// +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.njcn.common.pojo.annotation.OperateInfo; +//import com.njcn.common.pojo.constant.OperateType; +//import com.njcn.common.pojo.enums.common.LogEnum; +//import com.njcn.common.pojo.enums.response.CommonResponseEnum; +//import com.njcn.common.pojo.response.HttpResult; +//import com.njcn.common.utils.HttpResultUtil; +//import com.njcn.harmonic.pojo.param.ReportSearchParam; +//import com.njcn.harmonic.pojo.param.ReportTemplateParam; +//import com.njcn.harmonic.pojo.po.ExcelRptTemp; +//import com.njcn.harmonic.pojo.vo.ReportTemplateVO; +//import com.njcn.harmonic.pojo.vo.ReportTreeVO; +//import com.njcn.harmonic.pojo.vo.SysDeptTempVO; +//import com.njcn.harmonic.service.CustomReportService; +//import com.njcn.web.controller.BaseController; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiImplicitParam; +//import io.swagger.annotations.ApiOperation; +//import lombok.AllArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.*; +// +//import javax.servlet.http.HttpServletResponse; +//import java.util.List; +// +///** +// * pqs +// * 用户自定义报表 +// * @author cdf +// * @date 2022/8/15 +// */ +// +//@Slf4j +//@RestController +//@RequestMapping("/customReport") +//@Api(tags = "用户自定义报表") +//@AllArgsConstructor +//public class CsCustomReportController extends BaseController { +// +// private final CustomReportService customReportService; +// +// /** +// * 新增自定义报表模板 +// * @author cdf +// * @date 2022/10/19 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType=OperateType.ADD) +// @PostMapping("/addTemplate") +// @ApiOperation("新增自定义报表模板") +// public HttpResult addCustomReportTemplate(@Validated ReportTemplateParam reportTemplateParam){ +// String methodDescribe = getMethodDescribe("addCustomReportTemplate"); +// boolean res = customReportService.addCustomReportTemplate(reportTemplateParam); +// if(res){ +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); +// }else { +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); +// } +// } +// +// /** +// * 查询所有模板 +// * @author qijian +// * @date 2022/10/14 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @PostMapping("/getTemplateList") +// @ApiOperation("查询报表模板") +// @ApiImplicitParam(name = "reportSearchParam", value = "实体参数", required = false) +// public HttpResult> getTemplateList(@RequestBody ReportSearchParam reportSearchParam){ +// String methodDescribe = getMethodDescribe("getTemplateList"); +// List list = customReportService.getTemplateList(reportSearchParam); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); +// } +// +// /** +// * 根据部门查询模板 +// * @author qijian +// * @date 2022/10/19 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @GetMapping("/getTemplateByDept") +// @ApiOperation("根据部门查询模板") +// @ApiImplicitParam(name = "id", value = "id", required = true) +// public HttpResult> getTemplateByDept(@RequestParam("id") String id){ +// String methodDescribe = getMethodDescribe("getTemplateList"); +// List list = customReportService.getTemplateByDept(id); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); +// } +// +// /** +// * 删除模板 +// * @author qijian +// * @date 2022/10/18 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType=OperateType.DELETE) +// @PostMapping("/delTemplate") +// @ApiOperation("删除报表模板") +// @ApiImplicitParam(name = "reportSearchParam", value = "实体参数", required = false) +// public HttpResult delTemplate(@RequestBody ReportSearchParam reportSearchParam){ +// String methodDescribe = getMethodDescribe("delTemplate"); +// boolean res = customReportService.delTemplate(reportSearchParam); +// if(res){ +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); +// }else { +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); +// } +// } +// +// /** +// * 根据id查询模板详情 +// * @author qijian +// * @date 2022/10/14 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @GetMapping("/getCustomReportTemplateById") +// @ApiOperation("根据id查询模板详情") +// @ApiImplicitParam(name = "id", value = "id", required = true) +// public HttpResult getCustomReportTemplateById(@RequestParam("id") String id){ +// String methodDescribe = getMethodDescribe("getCustomReportTemplateById"); +// ExcelRptTemp excelRptTemp = customReportService.getCustomReportTemplateById(id); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, excelRptTemp, methodDescribe); +// } +// +// /** +// * 根据id回显模板 +// * @author qijian +// * @date 2022/10/14 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @GetMapping("/viewCustomReportTemplateById") +// @ApiOperation("根据id查询模板详情") +// @ApiImplicitParam(name = "id", value = "id", required = true) +// public void viewCustomReportTemplateById(@RequestParam("id") String id,HttpServletResponse response){ +// customReportService.viewCustomReportTemplateById(id,response); +// } +// +// /** +// * 修改自定义报表模板 +// * @author qijian +// * @date 2022/10/18 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType=OperateType.UPDATE) +// @PostMapping("/updateTemplate") +// @ApiOperation("修改自定义报表模板") +// public HttpResult updateCustomReportTemplate(@Validated ReportTemplateParam.UpdateReportTemplateParam reportTemplateParam){ +// String methodDescribe = getMethodDescribe("updateCustomReportTemplate"); +// boolean res = customReportService.updateCustomReportTemplate(reportTemplateParam); +// if(res){ +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); +// }else { +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); +// } +// } +// +// /** +// * 绑定/解绑模板数据 +// * @author qijian +// * @date 2022/10/19 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType=OperateType.UPDATE) +// @PostMapping("/updateBindTemplate") +// @ApiOperation("绑定/解绑模板数据") +// @ApiImplicitParam(name = "reportSearchParams", value = "实体参数", required = false) +// public HttpResult updateBindTemplate(@RequestBody List reportSearchParams){ +// String methodDescribe = getMethodDescribe("updateBindTemplate"); +// boolean res = customReportService.updateBindTemplate(reportSearchParams); +// if(res){ +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); +// }else { +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); +// } +// } +// +// /** +// * 根据模板ID查询数据 +// * @author qijian +// * @date 2022/10/19 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @GetMapping("/getDataByTempId") +// @ApiOperation("根据模板ID查询数据") +// @ApiImplicitParam(name = "id", value = "id", required = true) +// public HttpResult> getDataByTempId(@RequestParam("id")String id){ +// String methodDescribe = getMethodDescribe("getDataByTempId"); +// List list = customReportService.getDataByTempId(id); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); +// } +// +// /** +// * 修改激活状态 +// * @author qijian +// * @date 2022/10/17 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType=OperateType.UPDATE) +// @PostMapping("/updateTemplateActive") +// @ApiOperation("修改激活状态") +// @ApiImplicitParam(name = "reportSearchParam", value = "实体参数", required = false) +// public HttpResult> updateTemplateActive(@RequestBody ReportSearchParam reportSearchParam){ +// String methodDescribe = getMethodDescribe("updateTemplateActive"); +// boolean res = customReportService.updateStatus(reportSearchParam); +// if(res){ +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); +// }else { +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); +// } +// } +// +// /** +// * 获取报表模板树 +// * @author cdf +// * @date 2022/8/16 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @GetMapping("/reportChooseTree") +// @ApiOperation("获取报表模板树") +// public HttpResult> reportChooseTree(){ +// String methodDescribe = getMethodDescribe("reportChooseTree"); +// List res = customReportService.reportChooseTree(); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); +// } +// +// /** +// * 替换报表数据并返回 +// * @author qijian +// * @date 2022/10/19 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @PostMapping("/getCustomReport") +// @ApiOperation("获取报表") +// @ApiImplicitParam(name = "reportSearchParam", value = "查询体", required = false) +// public void getCustomReport(@RequestBody ReportSearchParam reportSearchParam, HttpServletResponse response) { +// String methodDescribe = getMethodDescribe("getCustomReport"); +// customReportService.getCustomReport(reportSearchParam,response); +// } +// +// +// /** +// * 获取报表指标是否合格模板树 +// * @author cdf +// * @date 2023/10/11 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @GetMapping("/targetLimitChooseTree") +// @ApiOperation("获取报表指标是否合格模板树") +// public HttpResult> targetLimitChooseTree(){ +// String methodDescribe = getMethodDescribe("targetLimitChooseTree"); +// List res = customReportService.targetLimitChooseTree(); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); +// } +// +// +// /** +// * 获取报表台账模板树 +// * @author cdf +// * @date 2023/10/11 +// */ +// @OperateInfo(info = LogEnum.BUSINESS_COMMON) +// @GetMapping("/terminalChooseTree") +// @ApiOperation("获取报表台账模板树") +// public HttpResult> terminalChooseTree(){ +// String methodDescribe = getMethodDescribe("terminalChooseTree"); +// List res = customReportService.terminalChooseTree(); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); +// } +// +//}