From d3f32fd3964e03eb2a3d803bd467c9d414958a29 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Tue, 24 Sep 2024 16:40:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=97=A0=E7=BA=BF=E8=AE=BE=E5=A4=87bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/csdevice/constant/DataParam.java | 2 + .../csdevice/pojo/vo/DataGroupEventVO.java | 2 +- cs-device/cs-device-boot/pom.xml | 14 +++-- .../service/impl/CsGroupServiceImpl.java | 41 ++++++++----- .../service/impl/WlRecordServiceImpl.java | 60 +++++++++++++++++++ .../njcn/csharmonic/api/EventFeignClient.java | 7 +++ .../EventFeignClientFallbackFactory.java | 10 ++++ .../param/CsEventUserQueryPage.java | 3 + ...Controller.java => CsEventController.java} | 17 +++++- .../csharmonic/service/CsEventPOService.java | 5 ++ .../service/impl/CsEventPOServiceImpl.java | 27 +++++++++ 11 files changed, 164 insertions(+), 24 deletions(-) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/{EventController.java => CsEventController.java} (79%) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java index 5209abe..36cbe4b 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java @@ -52,6 +52,8 @@ public interface DataParam { String EvtParamPhase = "Evt_Param_Phase"; + String EvtParamDepth = "Evt_Param_VVaDepth"; + String evtData = "evt_data"; String wlRecordPath = "test/"; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java index fdc5635..cbb3035 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java @@ -36,7 +36,7 @@ public class DataGroupEventVO { private String itemName; @ApiModelProperty("持续时间") - private Double duration; + private Double persistTime; @ApiModelProperty("发生时刻") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss.SSS") diff --git a/cs-device/cs-device-boot/pom.xml b/cs-device/cs-device-boot/pom.xml index d9010e6..d6a711d 100644 --- a/cs-device/cs-device-boot/pom.xml +++ b/cs-device/cs-device-boot/pom.xml @@ -154,12 +154,7 @@ 1.0.0 compile - - com.njcn - event-api - 1.0.0 - compile - + com.njcn access-api @@ -167,6 +162,13 @@ compile + + + com.njcn + common-device-biz + 1.0.0 + + diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index b044323..1b6ef3c 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -19,6 +19,7 @@ import com.njcn.csdevice.enums.LineBaseEnum; import com.njcn.csdevice.mapper.CsDataArrayMapper; import com.njcn.csdevice.mapper.CsGroArrMapper; import com.njcn.csdevice.mapper.CsGroupMapper; +import com.njcn.csdevice.mapper.OverlimitMapper; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; import com.njcn.csdevice.pojo.param.EnergyBaseParam; import com.njcn.csdevice.pojo.po.CsDataArray; @@ -33,15 +34,14 @@ import com.njcn.csdevice.service.ICsDataArrayService; import com.njcn.csdevice.service.ICsGroupService; import com.njcn.csdevice.util.InfluxDbParamUtil; import com.njcn.csdevice.utils.DataChangeUtil; +import com.njcn.csharmonic.api.EventFeignClient; import com.njcn.csharmonic.param.CommonStatisticalQueryParam; +import com.njcn.csharmonic.param.CsEventUserQueryPage; +import com.njcn.csharmonic.pojo.vo.CsEventVO; import com.njcn.csharmonic.pojo.vo.ThdDataTdVO; import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.device.biz.pojo.po.Overlimit; -import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.api.OverLimitClient; -import com.njcn.device.pq.pojo.vo.LineDetailVO; -import com.njcn.event.api.EventDetailFeignClient; -import com.njcn.event.pojo.po.RmpEventDetailPO; + import com.njcn.influx.pojo.bo.CommonQueryParam; import com.njcn.influx.pojo.dto.EventDataSetDTO; import com.njcn.influx.pojo.dto.StatisticalDataDTO; @@ -104,15 +104,13 @@ public class CsGroupServiceImpl extends ServiceImpl impl private final EvtDataService evtDataService; - private final EventDetailFeignClient eventDetailFeignClient; - private final DecimalFormat df = new DecimalFormat("#0.00"); private final EleEvtFeignClient eleEvtFeignClient; - private final OverLimitClient overLimitClient; + private final OverlimitMapper overlimitMapper; - private final LineFeignClient lineFeignClient; + private final EventFeignClient eventFeignClient; private final InfluxDbParamUtil influxDbParamUtil; @@ -390,9 +388,13 @@ public class CsGroupServiceImpl extends ServiceImpl impl return result; }else if("3".equals(type)){ //传3 则是暂态事件tab页面 - Page returnpage = new Page<> (commonStatisticalQueryParam.getPageNum(),commonStatisticalQueryParam.getPageSize()); - returnpage = this.getBaseMapper().getGroupEventList(returnpage,commonStatisticalQueryParam.getDevId(),commonStatisticalQueryParam.getLineId()); - returnpage.getRecords().forEach(temp->{ + CsEventUserQueryPage csEventUserQueryPage = new CsEventUserQueryPage(); + csEventUserQueryPage.setPageNum(commonStatisticalQueryParam.getPageNum()); + csEventUserQueryPage.setPageSize(commonStatisticalQueryParam.getPageSize()); + csEventUserQueryPage.setLineId(commonStatisticalQueryParam.getLineId()); + Page csEventVOPage = eventFeignClient.pageQueryByLineId(csEventUserQueryPage).getData(); + + csEventVOPage.getRecords().forEach(temp->{ //事件描述、相别、暂降幅值,需要特殊处理赋值 //事件描述 EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData(); @@ -420,11 +422,18 @@ public class CsGroupServiceImpl extends ServiceImpl impl }else { temp.setPhaseType(evtParamPhase.get(0).getValue()+(Objects.isNull(evtParamPhase.get(0).getUnit())?"":evtParamPhase.get(0).getUnit())); } + + List evtParamDepth = eventDataSetDTOS.stream(). + filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), DataParam.EvtParamDepth)). + collect(Collectors.toList()); + if(CollectionUtil.isEmpty(evtParamDepth)){ + temp.setFeatureAmplitude(null); + }else { + temp.setFeatureAmplitude(evtParamDepth.get(0).getValue().equals("-")?null:Float.parseFloat(evtParamDepth.get(0).getValue())); + } } - - }); - return returnpage; + return csEventVOPage; } return null; } @@ -453,7 +462,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl @Override public List getDeviceTrendData(String devId, String lineId,String groupId) { List data = new ArrayList(); - List overlimits = overLimitClient.getOverLimitByLineIds(Arrays.asList(lineId)).getData(); + List overlimits = overlimitMapper.selectBatchIds(Arrays.asList(lineId)); List finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(lineId)).getData(); List data1 = equipmentFeignClient.queryDeviceById(Stream.of(devId).collect(Collectors.toList())).getData(); //便携式设备-稳态指标-实时数据-指标 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java index ca26b1f..e8ad277 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java @@ -6,15 +6,21 @@ import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.constant.DataParam; import com.njcn.csdevice.enums.LineBaseEnum; +import com.njcn.csdevice.mapper.CsDeviceUserPOMapper; +import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper; +import com.njcn.csdevice.mapper.CsLinePOMapper; import com.njcn.csdevice.mapper.WlRecordMapper; import com.njcn.csdevice.param.WlRecordPageParam; import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; +import com.njcn.csdevice.pojo.dto.CsEquipmentProcessDTO; import com.njcn.csdevice.pojo.param.WlRecordParam; +import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.po.WlRecord; import com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo; @@ -39,6 +45,7 @@ import java.text.DecimalFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -65,6 +72,10 @@ public class WlRecordServiceImpl extends ServiceImpl i private final InfluxDbParamUtil influxDbParamUtil; + private final CsLinePOMapper csLinePOMapper; + + private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper; + private final DecimalFormat df = new DecimalFormat(DataParam.DecimalFormatStr); @Override @@ -176,6 +187,55 @@ public class WlRecordServiceImpl extends ServiceImpl i @Override public Object queryPage(WlRecordPageParam wlRecordPageParam) { //组装tree用于测试项绑定数据页面左侧的搜索树 + /* List devList = new ArrayList<>(); + if(wlRecordPageParam.getIsTrueFlag() == 0){ + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(WlRecord::getType,1).eq(WlRecord::getState, DataStateEnum.ENABLE.getCode()); + List wlRecordList = this.list(lambdaQueryWrapper); + + + + if(CollUtil.isNotEmpty(wlRecordList)){ + List devIds = wlRecordList.stream().map(WlRecord::getDevId).distinct().collect(Collectors.toList()); + List lineIds = wlRecordList.stream().map(WlRecord::getLineId).distinct().collect(Collectors.toList()); + List csLinePOList = csLinePOMapper.selectBatchIds(lineIds); + Map csLinePOMap = csLinePOList.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity())); + List csDevPOList = csEquipmentDeliveryMapper.selectList(new LambdaQueryWrapper().in(CsEquipmentDeliveryPO::getId,devIds)); + Map csDevPOMap = csDevPOList.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity())); + + Map> devMap = wlRecordList.stream().collect(Collectors.groupingBy(WlRecord::getDevId)); + + devMap.forEach((devId,list)->{ + RecordAllDevTreeVo devTree = new RecordAllDevTreeVo(); + devTree.setId(devId); + devTree.setName(csDevPOMap.get(list.get(0).getDevId()).getName()); + devTree.setPid("0"); + + Map> lineMap = list.stream().collect(Collectors.groupingBy(WlRecord::getLineId)); + List csLineList = new ArrayList<>(); + lineMap.forEach((lineId,lineList)->{ + RecordAllDevTreeVo recordAllDevTreeVo = new RecordAllDevTreeVo(); + recordAllDevTreeVo.setId(lineId); + recordAllDevTreeVo.setName(csLinePOMap.get(lineList.get(0).getLineId()).getName()); + recordAllDevTreeVo.setPid(devId); + List iiList = new ArrayList<>(); + lineList.forEach(it->{ + RecordAllDevTreeVo ii = new RecordAllDevTreeVo(); + ii.setId(it.getId()); + ii.setName(it.getStartTime()+"-"+it.getEndTime()); + ii.setPid(lineId); + iiList.add(ii); + }); + recordAllDevTreeVo.setChildren(iiList); + csLineList.add(recordAllDevTreeVo); + }); + devTree.setChildren(csLineList); + devList.add(devTree); + }); + } + + }*/ + List recordAllDevTreeVos = this.baseMapper.getRecordAll(wlRecordPageParam); for (RecordAllDevTreeVo recordAllDevTreeVo : recordAllDevTreeVos){ wlRecordPageParam.setDevId(recordAllDevTreeVo.getId()); diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventFeignClient.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventFeignClient.java index 7a34b90..b07977d 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventFeignClient.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventFeignClient.java @@ -1,9 +1,13 @@ package com.njcn.csharmonic.api; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.csdevice.pojo.vo.DataGroupEventVO; import com.njcn.csharmonic.api.fallback.EventFeignClientFallbackFactory; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.pojo.po.CsEventPO; +import com.njcn.csharmonic.pojo.vo.CsEventVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -18,4 +22,7 @@ public interface EventFeignClient { @PostMapping("/saveBatchEventList") HttpResult saveBatchEventList(@RequestBody List csEventPOS); + @PostMapping("/pageQueryByLineId") + HttpResult> pageQueryByLineId(@RequestBody CsEventUserQueryPage csEventUserQueryPage); + } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventFeignClientFallbackFactory.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventFeignClientFallbackFactory.java index 021321b..173faa3 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventFeignClientFallbackFactory.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventFeignClientFallbackFactory.java @@ -1,10 +1,14 @@ package com.njcn.csharmonic.api.fallback; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.csdevice.pojo.vo.DataGroupEventVO; import com.njcn.csharmonic.api.EventFeignClient; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.pojo.po.CsEventPO; +import com.njcn.csharmonic.pojo.vo.CsEventVO; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -30,6 +34,12 @@ public class EventFeignClientFallbackFactory implements FallbackFactory> pageQueryByLineId(CsEventUserQueryPage csEventUserQueryPage) { + log.error("{}异常，降级处理，异常为：{}","根据监测点分页查询暂降事件",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java index 8bb8d6e..9304a6e 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java @@ -40,6 +40,9 @@ public class CsEventUserQueryPage extends CsEventUserQueryParam{ */ private String deviceId; + @ApiModelProperty(value = "测点id") + private String lineId; + } \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsEventController.java similarity index 79% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsEventController.java index dc1c672..fe98de1 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsEventController.java @@ -1,10 +1,13 @@ 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.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.pojo.vo.DataGroupEventVO; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.po.CsEventPO; import com.njcn.csharmonic.pojo.vo.CsEventVO; @@ -33,7 +36,8 @@ import java.util.List; @RequestMapping("/event") @Api(tags = "暂降事件") @AllArgsConstructor -public class EventController extends BaseController { +public class CsEventController extends BaseController { + private final CsEventPOService csEventPOService; @@ -47,6 +51,17 @@ public class EventController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/pageQueryByLineId") + @ApiOperation("根据监测点分页查询暂降事件") + @ApiImplicitParam(name = "csEventUserQueryPage", value = "暂降事件查询参数", required = true) + public HttpResult> pageQueryByLineId(@RequestBody CsEventUserQueryPage csEventUserQueryPage) { + String methodDescribe = getMethodDescribe("queryEventList"); + Page page = csEventPOService.pageQueryByLineId(csEventUserQueryPage); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/analyseWave") @ApiOperation("暂态事件波形分析") diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java index 79773e1..da975b3 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java @@ -1,5 +1,8 @@ package com.njcn.csharmonic.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.csdevice.pojo.vo.DataGroupEventVO; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.po.CsEventPO; import com.baomidou.mybatisplus.extension.service.IService; @@ -40,5 +43,7 @@ public interface CsEventPOService extends IService{ List queryEventList(CsEventUserQueryParam csEventUserQueryParam); + Page pageQueryByLineId(CsEventUserQueryPage csEventUserQueryPage); + void saveBatchEventList(List csEventPOS); } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java index 1e0cd77..03311d1 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java @@ -1,14 +1,22 @@ package com.njcn.csharmonic.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.CsLedgerFeignClient; import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.po.CsLinePO; +import com.njcn.csdevice.pojo.vo.DataGroupEventVO; +import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.pojo.vo.CsEventVO; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.vo.EventDetailVO; @@ -119,6 +127,25 @@ public class CsEventPOServiceImpl extends ServiceImpl pageQueryByLineId(CsEventUserQueryPage csEventUserQueryPage) { + Page result = new Page<>(csEventUserQueryPage.getPageNum(),csEventUserQueryPage.getPageSize()); + DateTime begin = DateUtil.parse(csEventUserQueryPage.getStartTime(), DatePattern.NORM_DATE_PATTERN); + DateTime end = DateUtil.endOfDay(DateUtil.parse(csEventUserQueryPage.getEndTime(), DatePattern.NORM_DATE_PATTERN)); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(CsEventPO::getLineId,csEventUserQueryPage.getLineId()) + .eq(CsEventPO::getType,0).between(CsEventPO::getStartTime,begin,end) + .orderByDesc(CsEventPO::getStartTime); + Page page = this.page(new Page<>(csEventUserQueryPage.getPageNum(),csEventUserQueryPage.getPageSize()),lambdaQueryWrapper); + if(CollUtil.isNotEmpty(page.getRecords())){ + List dataGroupEventVOList = BeanUtil.copyToList(page.getRecords(),DataGroupEventVO.class); + result.setRecords(dataGroupEventVOList); + result.setTotal(page.getTotal()); + } + return result; + } + @Override @Transactional public void saveBatchEventList(List csEventPOS) {