diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java index c823604..2eec495 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/EventUserFeignClientFallbackFactory.java @@ -3,14 +3,12 @@ package com.njcn.csharmonic.api.fallback; 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.po.AppProjectPO; import com.njcn.csharmonic.api.EventUserFeignClient; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.vo.EventDetailVO; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PostMapping; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsLineLatestData.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsLineLatestData.java deleted file mode 100644 index 59d4b96..0000000 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsLineLatestData.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.njcn.csharmonic.pojo.po; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 治理设备模块运行状态记录表 - *

- * - * @author xy - * @since 2025-07-03 - */ -@Getter -@Setter -@TableName("cs_line_latest_data") -public class CsLineLatestData implements Serializable{ - - private static final long serialVersionUID = 1L; - - /** - * 监测点id - */ - @MppMultiId(value = "line_id") - private String lineId; - - /** - * 最新数据时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime timeId; - - -} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsLineLatestDataController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsLineLatestDataController.java deleted file mode 100644 index 56edf7d..0000000 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsLineLatestDataController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.njcn.csharmonic.controller; - - -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.csharmonic.param.CsEventUserQueryParam; -import com.njcn.csharmonic.pojo.po.CsLineLatestData; -import com.njcn.csharmonic.service.ICsLineLatestDataService; -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.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - *

- * 治理设备模块运行状态记录表 前端控制器 - *

- * - * @author xy - * @since 2025-07-03 - */ -@Slf4j -@RestController -@RequestMapping("/csLineLatestData") -@Api(tags = "暂降事件") -@AllArgsConstructor -public class CsLineLatestDataController extends BaseController { - - private final ICsLineLatestDataService csLineLatestDataService; - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/add") - @ApiOperation("新增") - @ApiImplicitParam(name = "csLineLatestData", value = "实体", required = true) - public HttpResult addData(@RequestBody CsLineLatestData csLineLatestData) { - String methodDescribe = getMethodDescribe("addData"); - csLineLatestDataService.addData(csLineLatestData); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/list") - @ApiOperation("查询") - @ApiImplicitParam(name = "csEventUserQueryParam", value = "暂降事件查询参数", required = true) - public HttpResult> listData(@RequestBody CsEventUserQueryParam csEventUserQueryParam) { - String methodDescribe = getMethodDescribe("queryEventList"); - List list = csLineLatestDataService.list(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } - -} - diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsLineLatestDataMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsLineLatestDataMapper.java deleted file mode 100644 index 73d3d30..0000000 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsLineLatestDataMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.csharmonic.mapper; - -import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.csharmonic.pojo.po.CsLineLatestData; - -/** - *

- * 治理设备模块运行状态记录表 Mapper 接口 - *

- * - * @author xy - * @since 2025-07-03 - */ -public interface CsLineLatestDataMapper extends MppBaseMapper { - -} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsLineLatestDataService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsLineLatestDataService.java deleted file mode 100644 index addba0e..0000000 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsLineLatestDataService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.njcn.csharmonic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.csharmonic.pojo.po.CsLineLatestData; - -/** - *

- * 治理设备模块运行状态记录表 服务类 - *

- * - * @author xy - * @since 2025-07-03 - */ -public interface ICsLineLatestDataService extends IService { - - void addData(CsLineLatestData csLineLatestData); - -} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsLineLatestDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsLineLatestDataServiceImpl.java deleted file mode 100644 index 67911af..0000000 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsLineLatestDataServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.njcn.csharmonic.service.impl; - -import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -import com.njcn.csharmonic.mapper.CsLineLatestDataMapper; -import com.njcn.csharmonic.pojo.po.CsLineLatestData; -import com.njcn.csharmonic.service.ICsLineLatestDataService; -import org.springframework.stereotype.Service; - -/** - *

- * 治理设备模块运行状态记录表 服务实现类 - *

- * - * @author xy - * @since 2025-07-03 - */ -@Service -public class CsLineLatestDataServiceImpl extends MppServiceImpl implements ICsLineLatestDataService { - - @Override - public void addData(CsLineLatestData csLineLatestData) { - - } -} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java index 3526e80..d135c25 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java @@ -1,6 +1,8 @@ package com.njcn.csharmonic.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.njcn.access.api.CsLineLatestDataFeignClient; +import com.njcn.access.pojo.po.CsLineLatestData; import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.api.IntegrityFeignClient; @@ -13,7 +15,6 @@ import com.njcn.csharmonic.pojo.param.StatisticsDataParam; import com.njcn.csharmonic.pojo.vo.DataVo; import com.njcn.csharmonic.pojo.vo.HalfMonthReportVO; import com.njcn.csharmonic.service.IStatisticsDataDataService; -import com.njcn.influx.pojo.bo.CommonQueryParam; import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.influx.service.CommonService; import lombok.RequiredArgsConstructor; @@ -22,7 +23,10 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; @@ -38,6 +42,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService private final CommonService commonService; private final IntegrityFeignClient integrityFeignClient; private final OnlineRateFeignClient onlineRateFeignClient; + private final CsLineLatestDataFeignClient csLineLatestDataFeignClient; @Override public List getLineIntegrity(StatisticsDataParam param) { @@ -101,6 +106,9 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService List list1 = integrityFeignClient.list(lineList,param.getStartTime(),param.getEndTime()).getData(); //获取终端在线率 List list2 = onlineRateFeignClient.list(deviceList,param.getStartTime(),param.getEndTime()).getData(); + //获取监测点最新数据时间 + List list3 = csLineLatestDataFeignClient.listData().getData(); + equipmentDeliveryList.forEach(dev->{ List list = devMap.get(dev.getId()); if (CollectionUtil.isNotEmpty(list)) { @@ -111,9 +119,8 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService vo.setDevName(dev.getName()); vo.setDevType(dev.getDevType()); vo.setMac(dev.getMac()); - vo.setOperationalStatus(dev.getUsageStatus() == 0 ? "停运" : "在运"); - //fixme 先用设备登记时间记作投运时间 vo.setOperationalTime(dev.getCreateTime()); + vo.setOperationalStatus(dev.getUsageStatus() == 0 ? "停运" : "在运"); vo.setLineName(line.getName()); vo.setCommunicationStatus(dev.getRunStatus() == 1 ? "离线" : "在线"); vo.setLatestTime(LocalDateTime.now()); @@ -139,11 +146,14 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService } else { vo.setOnlineRate(0.0); } + //获取最新数据时间 + List l3 = list3.stream().filter(item -> item.getLineId().equals(line.getLineId())).collect(Collectors.toList()); + vo.setLatestTime(CollectionUtil.isNotEmpty(l3) ? l3.get(0).getTimeId() : null); result.add(vo); }); } }); - //获取最新数据时间 + } } return result;