diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DevDetailDTO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DevDetailDTO.java index c8d0227..1061065 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DevDetailDTO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DevDetailDTO.java @@ -3,6 +3,8 @@ package com.njcn.csdevice.pojo.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Description: * Date: 2023/9/6 13:59【需求编号】 @@ -37,4 +39,7 @@ public class DevDetailDTO { @ApiModelProperty(value = "设备MAC地址") private String devMac; + + @ApiModelProperty(value = "监测点id集合") + private List lineList; } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/LineParamDTO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/LineParamDTO.java index 9d21bb4..fdb0b8b 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/LineParamDTO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/LineParamDTO.java @@ -1,8 +1,10 @@ package com.njcn.csdevice.pojo.dto; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -13,7 +15,7 @@ import java.util.List; * @version V1.0.0 */ @Data -public class LineParamDTO { +public class LineParamDTO extends BaseParam implements Serializable { @ApiModelProperty(value = "工程id") private String engineerId; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java index cf1be76..a0f88de 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java @@ -6,12 +6,13 @@ 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.enums.DeviceOperate; -import com.njcn.csdevice.mapper.CsDeviceUserPOMapper; import com.njcn.csdevice.pojo.param.UserDevParam; import com.njcn.csdevice.pojo.po.CsDeviceUserPO; import com.njcn.csdevice.pojo.vo.DevCountVO; import com.njcn.csdevice.pojo.vo.DevUserVO; import com.njcn.csdevice.service.CsDeviceUserPOService; +import com.njcn.csharmonic.api.EventUserFeignClient; +import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.web.advice.DeviceLog; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.RequestUtil; @@ -41,7 +42,7 @@ import java.util.Objects; public class DeviceUserController extends BaseController { private final CsDeviceUserPOService csDeviceUserPOService; - private final CsDeviceUserPOMapper csDeviceUserPOMapper; + private final EventUserFeignClient eventUserFeignClient; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/add") @@ -187,10 +188,16 @@ public class DeviceUserController extends BaseController { public HttpResult> getIdList(@RequestParam("param") String param){ String methodDescribe = getMethodDescribe("getIdList"); List list = new ArrayList<>(); + CsEventUserQueryParam param1 = new CsEventUserQueryParam(); + param1.setUserId(RequestUtil.getUserIndex()); + param1.setStartTime(null); + param1.setEndTime(null); + param1.setEventIds(null); + if (Objects.equals(param, "1")) { - list = csDeviceUserPOMapper.queryTempHarmonic(RequestUtil.getUserIndex(),null,null,null); + list = eventUserFeignClient.queryTempHarmonic(param1).getData(); } else if (Objects.equals(param, "3")) { - list = csDeviceUserPOMapper.queryAlarmEvent(RequestUtil.getUserIndex(),null,null,null); + list = eventUserFeignClient.queryAlarmEvent(param1).getData(); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java index 6d799ca..187ae53 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java @@ -61,7 +61,7 @@ public class CsTouristDataPOController extends BaseController { @PostMapping("/queryAll") @ApiOperation("查询游客数据") public HttpResult> queryAll(){ - String methodDescribe = getMethodDescribe("query"); + String methodDescribe = getMethodDescribe("queryAll"); List list = csTouristDataPOService.queryAll(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDeviceUserPOMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDeviceUserPOMapper.java index 286f63f..9254380 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDeviceUserPOMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDeviceUserPOMapper.java @@ -2,9 +2,6 @@ package com.njcn.csdevice.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.csdevice.pojo.po.CsDeviceUserPO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @@ -15,17 +12,4 @@ import java.util.List; * @version V1.0.0 */ public interface CsDeviceUserPOMapper extends BaseMapper { - - //查询暂态事件(未读) - List queryTempEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); - - //查询稳态事件(未读) - List queryTempHarmonic(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); - - //查询告警事件(未读) - List queryAlarmEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); - - //查询运行事件(未读) - List queryRunEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); - } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDeviceUserPOMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDeviceUserPOMapper.xml index 0f23852..fd73414 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDeviceUserPOMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDeviceUserPOMapper.xml @@ -16,72 +16,4 @@ primary_user_id, sub_user_id, device_id, create_by, create_time, update_by, update_time - - - - - - - - - \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsCommTerminalServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsCommTerminalServiceImpl.java index 07258a0..9ef9c55 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsCommTerminalServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsCommTerminalServiceImpl.java @@ -93,27 +93,33 @@ public class CsCommTerminalServiceImpl implements CsCommTerminalService { @Override public List commGetDevIds(String userId) { UserVO userVO = userFeignClient.getUserById(userId).getData(); - List devIds; + List devIds = new ArrayList<>(); if (userVO.getType().equals(UserType.SUPER_ADMINISTRATOR) || userVO.getType().equals(UserType.ADMINISTRATOR)) { devIds = csEquipmentDeliveryService.getAll().stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList()); } else { - List devList = csDeviceUserPOService.lambdaQuery().select(CsDeviceUserPO::getDeviceId) - .and(w -> w.eq(CsDeviceUserPO::getPrimaryUserId, userId).or().eq(CsDeviceUserPO::getSubUserId, userId)) - .eq(CsDeviceUserPO::getStatus, DataStateEnum.ENABLE.getCode()).list(); - devIds = devList.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList()); //note 黄是在cs_market_data写入数据，是用户和工程的关系； - // 但是权限根据用户和设备来判断会有问题，还需要用户和工程的关系(针对营销 工程用户)，所以这边还要添加用户和工程的关系 - List list = csMarketDataService.queryByUseId(userId); - if (CollUtil.isNotEmpty(list)) { - List engineerIds = list.stream().map(CsMarketDataVO::getEngineerId).distinct().collect(Collectors.toList()); - List devs = csLedgerService.getDevInfoByEngineerIds(engineerIds); - devIds.addAll(devs.stream().map(DevDetailDTO::getEquipmentId).distinct().collect(Collectors.toList())); + // 但是权限根据用户和设备来判断会有问题，还需要用户和工程的关系(针对营销 工程用户)，所以这边还要添加用户和工程的关系。 + // 如果是营销 工程用户 没有配置相关工程，直接返回空的设备列表；如果有数据，也要判断下当前关注的工程里面是否包含主用户的设备，可能出现没有关注该工程，但是因为是设备的主用户导致数据统计错误 + String roleString = RequestUtil.getUserRole(); + if (roleString.contains(AppRoleEnum.MARKET_USER.getCode()) || roleString.contains(AppRoleEnum.ENGINEERING_USER.getCode())) { + List list = csMarketDataService.queryByUseId(userId); + if (CollUtil.isNotEmpty(list)) { + List engineerIds = list.stream().map(CsMarketDataVO::getEngineerId).distinct().collect(Collectors.toList()); + List devs = csLedgerService.getDevInfoByEngineerIds(engineerIds); + devIds = devs.stream().map(DevDetailDTO::getEquipmentId).distinct().collect(Collectors.toList()); + } } //note 如果是游客，则还需要加入系统配置的设备 - String roleString = RequestUtil.getUserRole(); - if (roleString.contains(AppRoleEnum.TOURIST.getCode())) { + else if (roleString.contains(AppRoleEnum.TOURIST.getCode())) { devIds.addAll(csTouristDataPOService.queryAll().stream().map(CsTouristDataParmVO::getDeviceId).distinct().collect(Collectors.toList())); } + //note 如果是普通用户，则需要根据用户权限来获取设备列表 + else { + List devList = csDeviceUserPOService.lambdaQuery().select(CsDeviceUserPO::getDeviceId) + .and(w -> w.eq(CsDeviceUserPO::getPrimaryUserId, userId).or().eq(CsDeviceUserPO::getSubUserId, userId)) + .eq(CsDeviceUserPO::getStatus, DataStateEnum.ENABLE.getCode()).list(); + devIds = devList.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList()); + } } if (!CollUtil.isEmpty(devIds)) { devIds = devIds.stream().distinct().collect(Collectors.toList()); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java index d209e8e..512910e 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java @@ -10,14 +10,16 @@ import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.mapper.CsDeviceUserPOMapper; import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper; import com.njcn.csdevice.mapper.CsMarketDataMapper; +import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.param.UserDevParam; import com.njcn.csdevice.pojo.po.*; import com.njcn.csdevice.pojo.vo.CsLedgerVO; +import com.njcn.csdevice.pojo.vo.CsTouristDataParmVO; import com.njcn.csdevice.pojo.vo.DevCountVO; import com.njcn.csdevice.pojo.vo.DevUserVO; import com.njcn.csdevice.service.*; import com.njcn.csharmonic.api.EventUserFeignClient; -import com.njcn.cssystem.api.FeedBackFeignClient; +import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.harmonic.utils.PublicDataUtils; import com.njcn.user.api.UserFeignClient; import com.njcn.user.enums.AppRoleEnum; @@ -30,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -51,14 +54,12 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl appLedger = iCsLedgerService.appLineTree(); + //判断当前用户，如果是游客，则需要筛选数据,只保留游客的数据 + String roleString = RequestUtil.getUserRole(); + if (roleString.contains(AppRoleEnum.TOURIST.getCode())) { + List csTouristDataParmVOList = csTouristDataPOService.queryAll(); + if (CollectionUtil.isNotEmpty(csTouristDataParmVOList)) { + List devList = csTouristDataParmVOList.stream().map(CsTouristDataParmVO::getDeviceId).collect(Collectors.toList()); + // 保留游客有权限的工程、项目、设备、监测点数据 + appLedger = appLedger.stream() + .filter(engineering -> { + boolean hasValidProject = false; + if (CollectionUtil.isNotEmpty(engineering.getChildren())) { + List validProjects = engineering.getChildren().stream() + .filter(project -> { + boolean hasValidDevice = false; + if (CollectionUtil.isNotEmpty(project.getChildren())) { + List validDevices = project.getChildren().stream() + .filter(device -> devList.contains(device.getId())) + .collect(Collectors.toList()); + project.setChildren(validDevices); + hasValidDevice = CollectionUtil.isNotEmpty(validDevices); + } + return hasValidDevice; + }) + .collect(Collectors.toList()); + engineering.setChildren(validProjects); + hasValidProject = CollectionUtil.isNotEmpty(validProjects); + } + return hasValidProject; + }) + .collect(Collectors.toList()); + } else { + // 如果游客没有配置任何数据权限，返回空列表 + appLedger = new ArrayList<>(); + } + } + if (CollectionUtil.isNotEmpty(appLedger)) { //获取第一层项目层级 List firstLevelList = new ArrayList<>(); //获取第三层设备层级 List thirdLevelList = new ArrayList<>(); + //获取第四层设备层级 + List forthLevelList = new ArrayList<>(); for (CsLedgerVO firstLevel : appLedger) { firstLevelList.add(firstLevel); if (CollectionUtil.isNotEmpty(firstLevel.getChildren())) { for (CsLedgerVO secondLevel : firstLevel.getChildren()) { if (CollectionUtil.isNotEmpty(secondLevel.getChildren())) { thirdLevelList.addAll(secondLevel.getChildren()); + for (CsLedgerVO threeLevel : secondLevel.getChildren()) { + if (CollectionUtil.isNotEmpty(threeLevel.getChildren())) { + forthLevelList.addAll(threeLevel.getChildren()); + } + } + } } } @@ -163,17 +208,30 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl eventCount = this.baseMapper.queryTempEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null); - vo.setEventCount(CollectionUtil.isNotEmpty(eventCount)?eventCount.size():0); + if (CollectionUtil.isNotEmpty(forthLevelList)) { + CsEventUserQueryParam param1 = new CsEventUserQueryParam(); + param1.setUserId(RequestUtil.getUserIndex()); + param1.setStartTime(PublicDataUtils.calculateMonthStart(time)); + param1.setEndTime(PublicDataUtils.calculateMonthEnd(time)); + param1.setEventIds(forthLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList())); - List harmonicCount = this.baseMapper.queryTempHarmonic(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null); - vo.setHarmonicCount(CollectionUtil.isNotEmpty(harmonicCount)?harmonicCount.size():0); + List eventCount = eventUserFeignClient.queryTempEvent(param1).getData(); + vo.setEventCount(CollectionUtil.isNotEmpty(eventCount)?eventCount.size():0); + List harmonicCount = eventUserFeignClient.queryTempHarmonic(param1).getData(); + vo.setHarmonicCount(CollectionUtil.isNotEmpty(harmonicCount)?harmonicCount.size():0); + } + if (CollectionUtil.isNotEmpty(thirdLevelList)) { + CsEventUserQueryParam param1 = new CsEventUserQueryParam(); + param1.setUserId(RequestUtil.getUserIndex()); + param1.setStartTime(PublicDataUtils.calculateMonthStart(time)); + param1.setEndTime(PublicDataUtils.calculateMonthEnd(time)); + param1.setEventIds(thirdLevelList.stream().map(CsLedgerVO::getId).collect(Collectors.toList())); - List alarmCount = this.baseMapper.queryAlarmEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null); - vo.setAlarmCount(CollectionUtil.isNotEmpty(alarmCount)?alarmCount.size():0); - - List runCount = this.baseMapper.queryRunEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),null); - vo.setRunCount(CollectionUtil.isNotEmpty(runCount)?runCount.size():0); + List alarmCount = eventUserFeignClient.queryAlarmEvent(param1).getData(); + vo.setAlarmCount(CollectionUtil.isNotEmpty(alarmCount)?alarmCount.size():0); + List runCount = eventUserFeignClient.queryRunEvent(param1).getData(); + vo.setRunCount(CollectionUtil.isNotEmpty(runCount)?runCount.size():0); + } //note 当前工程数据 //当前工程id @@ -228,17 +286,29 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl eventCount2 = this.baseMapper.queryTempEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentLineIds); + CsEventUserQueryParam param1 = new CsEventUserQueryParam(); + param1.setUserId(RequestUtil.getUserIndex()); + param1.setStartTime(PublicDataUtils.calculateMonthStart(time)); + param1.setEndTime(PublicDataUtils.calculateMonthEnd(time)); + param1.setEventIds(currentLineIds); + + List eventCount2 = eventUserFeignClient.queryTempEvent(param1).getData(); vo.setCurrentEventCount(CollectionUtil.isNotEmpty(eventCount2)?eventCount2.size():0); - List harmonicCount2 = this.baseMapper.queryTempHarmonic(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentLineIds); + List harmonicCount2 = eventUserFeignClient.queryTempHarmonic(param1).getData(); vo.setCurrentHarmonicCount(CollectionUtil.isNotEmpty(harmonicCount2)?harmonicCount2.size():0); } if (CollectionUtil.isNotEmpty(currentDevIds)) { - List alarmCount2 = this.baseMapper.queryAlarmEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentDevIds); + CsEventUserQueryParam param1 = new CsEventUserQueryParam(); + param1.setUserId(RequestUtil.getUserIndex()); + param1.setStartTime(PublicDataUtils.calculateMonthStart(time)); + param1.setEndTime(PublicDataUtils.calculateMonthEnd(time)); + param1.setEventIds(currentDevIds); + + List alarmCount2 = eventUserFeignClient.queryAlarmEvent(param1).getData(); vo.setCurrentAlarmCount(CollectionUtil.isNotEmpty(alarmCount2)?alarmCount2.size():0); - List runCount2 = this.baseMapper.queryRunEvent(RequestUtil.getUserIndex(),PublicDataUtils.calculateMonthStart(time),PublicDataUtils.calculateMonthEnd(time),currentDevIds); + List runCount2 = eventUserFeignClient.queryRunEvent(param1).getData(); vo.setCurrentRunCount(CollectionUtil.isNotEmpty(runCount2)?runCount2.size():0); } } @@ -535,6 +605,21 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl ledger = iCsLedgerService.getInfoByIds(Collections.singletonList(devId)); + if (CollectionUtil.isNotEmpty(ledger)) { + DevDetailDTO item = ledger.get(0); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CsMarketData::getEngineerId, item.getEngineeringid()); + List csMarketData = csMarketDataMapper.selectList(queryWrapper); + if (CollectionUtil.isNotEmpty(csMarketData)) { + List collect = csMarketData.stream().map(CsMarketData::getUserId).collect(Collectors.toList()); + result.addAll(collect); + } + } + if (CollectionUtil.isNotEmpty(result)) { + result = result.stream().distinct().collect(Collectors.toList()); + } return result; } 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 8906e4f..6d58c6f 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 @@ -996,7 +996,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(CsEquipmentDeliveryPO::getNodeId,id) - .in(ObjectUtil.isNotEmpty(state),CsEquipmentDeliveryPO::getUsageStatus,state); + .in(ObjectUtil.isNotEmpty(state),CsEquipmentDeliveryPO::getUsageStatus,state) + .eq(CsEquipmentDeliveryPO::getDevAccessMethod,"CLD"); return this.list(lambdaQueryWrapper); } 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 50a10b4..39a2a12 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 @@ -1341,11 +1341,25 @@ public class CsLedgerServiceImpl extends ServiceImpl i if (CollUtil.isNotEmpty(dev)) { List devIds = dev.stream().map(CsLedger::getId).collect(Collectors.toList()); + + //监测点 + LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); + queryWrapper3.in(CsLedger::getPid, devIds); + List line = this.list(queryWrapper3); + Map> lineMap = line.stream().collect(Collectors.groupingBy(CsLedger::getPid)); + + List devs = csEquipmentDeliveryMapper.selectBatchIds(devIds); Map devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, item -> item)); dev.forEach(item -> { DevDetailDTO detail = new DevDetailDTO(); + //监测点 + List lines = lineMap.get(item.getId()); + if (CollUtil.isNotEmpty(lines)) { + detail.setLineList(lines.stream().map(CsLedger::getId).collect(Collectors.toList())); + } + detail.setEquipmentName(item.getName()); detail.setEquipmentId(item.getId()); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java index ac8cf09..101a46f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java @@ -132,18 +132,19 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService { } //fix 新需求 工程用户可以看到关注工程的设备和对应的主用户和子用户的设备 + //note 这边工程用户不查询主设备，只看关注的工程，做下调整，不然会出现工程用户未关注任何工程，但是有一台主设备，导致界面有数据 else if (Objects.equals(role, AppRoleEnum.ENGINEERING_USER.getCode())) { List sumDevId = new ArrayList<>(); csDeviceUserPOQueryWrapper.clear(); - csDeviceUserPOQueryWrapper.eq("status","1").and(wq -> { - wq.eq("primary_user_id", userIndex) - .or() - .eq("sub_user_id",userIndex); - }); - List csDeviceUserPOS = csDeviceUserPOMapper.selectList(csDeviceUserPOQueryWrapper); - if(!CollectionUtils.isEmpty(csDeviceUserPOS)){ - sumDevId = csDeviceUserPOS.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList()); - } +// csDeviceUserPOQueryWrapper.eq("status","1").and(wq -> { +// wq.eq("primary_user_id", userIndex) +// .or() +// .eq("sub_user_id",userIndex); +// }); +// List csDeviceUserPOS = csDeviceUserPOMapper.selectList(csDeviceUserPOQueryWrapper); +// if(!CollectionUtils.isEmpty(csDeviceUserPOS)){ +// sumDevId = csDeviceUserPOS.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList()); +// } QueryWrapper csMarketDataQueryWrapper = new QueryWrapper<>(); csMarketDataQueryWrapper.eq("user_id", userIndex); diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventUserFeignClient.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventUserFeignClient.java index 40373f6..d977577 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventUserFeignClient.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/EventUserFeignClient.java @@ -6,6 +6,7 @@ import com.njcn.csharmonic.api.fallback.EventUserFeignClientFallbackFactory; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -27,4 +28,20 @@ public interface EventUserFeignClient { @PostMapping("/deleteByIds") HttpResult deleteByIds(@RequestBody List eventList); + + @PostMapping("/queryTempEvent") + @ApiOperation("查询暂态事件(未读)") + HttpResult> queryTempEvent(@RequestBody CsEventUserQueryParam param); + + @PostMapping("/queryTempHarmonic") + @ApiOperation("查询稳态事件(未读)") + HttpResult> queryTempHarmonic(@RequestBody CsEventUserQueryParam param); + + @PostMapping("/queryAlarmEvent") + @ApiOperation("查询告警事件(未读)") + HttpResult> queryAlarmEvent(@RequestBody CsEventUserQueryParam param); + + @PostMapping("/queryRunEvent") + @ApiOperation("查询运行事件(未读)") + HttpResult> queryRunEvent(@RequestBody CsEventUserQueryParam param); } 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 793c852..48d1c9c 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 @@ -45,6 +45,30 @@ public class EventUserFeignClientFallbackFactory implements FallbackFactory> queryTempEvent(CsEventUserQueryParam param) { + log.error("{}异常，降级处理，异常为：{}","查询暂态事件(未读)异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> queryTempHarmonic(CsEventUserQueryParam param) { + log.error("{}异常，降级处理，异常为：{}","查询稳态事件(未读)异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> queryAlarmEvent(CsEventUserQueryParam param) { + log.error("{}异常，降级处理，异常为：{}","查询告警事件(未读)异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> queryRunEvent(CsEventUserQueryParam param) { + log.error("{}异常，降级处理，异常为：{}","查询运行事件(未读)异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HarmonicVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HarmonicVO.java index ced7f1b..920c2ba 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HarmonicVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HarmonicVO.java @@ -24,7 +24,10 @@ public class HarmonicVO implements Serializable { @ApiModelProperty(value = "越限监测点数") private Integer overLineNums = 0; - @ApiModelProperty(value = "越限监测点数") + @ApiModelProperty(value = "越限日期") + private List overDaysList; + + @ApiModelProperty(value = "越限监测点详情") private List list = new ArrayList<>(); @Data @@ -59,5 +62,31 @@ public class HarmonicVO implements Serializable { } + @Data + public static class LineHarmonicOverDays implements Serializable { + + @ApiModelProperty(value = "工程名称") + private String engineeringName; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "设备名称") + private String devName; + + @ApiModelProperty(value = "监测点id") + private String lineId; + + @ApiModelProperty(value = "监测点名称") + private String lineName; + + @ApiModelProperty(value = "越限日期字符串") + private String timeString; + + @ApiModelProperty(value = "越限日期集合") + private List timeList; + + } + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsAlarmController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsAlarmController.java index 5acb1e8..c53931e 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsAlarmController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsAlarmController.java @@ -2,6 +2,7 @@ package com.njcn.csharmonic.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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; @@ -42,9 +43,9 @@ public class CsAlarmController extends BaseController { @PostMapping("/queryAlarmList") @ApiOperation("运行告警事件列表(app)") @ApiImplicitParam(name = "param", value = "事件查询参数", required = true) - public HttpResult> queryAlarmList(@RequestBody LineParamDTO param) { + public HttpResult> queryAlarmList(@RequestBody LineParamDTO param) { String methodDescribe = getMethodDescribe("queryAlarmList"); - List result = csAlarmService.queryAlarmList(param); + Page result = csAlarmService.queryAlarmList(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicController.java index a319f66..db977ae 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicController.java @@ -2,6 +2,7 @@ package com.njcn.csharmonic.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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; @@ -42,17 +43,17 @@ public class CsHarmonicController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryHarmonicList") @ApiOperation("稳态事件列表(app)") - @ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true) - public HttpResult queryHarmonicList(@RequestBody LineParamDTO param) { + @ApiImplicitParam(name = "param", value = "事件查询参数", required = true) + public HttpResult> queryHarmonicList(@RequestBody LineParamDTO param) { String methodDescribe = getMethodDescribe("queryHarmonicList"); - HarmonicVO vo = csHarmonicService.queryAppList(param); + Page vo = csHarmonicService.queryAppList(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe); } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryHarmonicDetail") @ApiOperation("稳态事件详情(app)") - @ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true) + @ApiImplicitParam(name = "param", value = "事件查询参数", required = true) public HttpResult> queryHarmonicDetail(@RequestBody LineParamDTO param) { String methodDescribe = getMethodDescribe("queryHarmonicDetail"); List vo = csHarmonicService.queryHarmonicDetail(param); @@ -62,7 +63,7 @@ public class CsHarmonicController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/addList") @ApiOperation("批量写入数据") - @ApiImplicitParam(name = "list", value = "暂降事件查询参数", required = true) + @ApiImplicitParam(name = "list", value = "事件查询参数", required = true) public HttpResult addList(@RequestBody List list) { String methodDescribe = getMethodDescribe("addList"); boolean result = csHarmonicService.saveOrUpdateBatch(list); @@ -93,5 +94,25 @@ public class CsHarmonicController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryAppHarmonicCounts") + @ApiOperation("查询App稳态事件总数") + @ApiImplicitParam(name = "param", value = "事件查询参数", required = true) + public HttpResult queryAppHarmonicCounts(@RequestBody LineParamDTO param) { + String methodDescribe = getMethodDescribe("queryAppHarmonicCounts"); + HarmonicVO vo = csHarmonicService.queryAppHarmonicCounts(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryAppHarmonicLine") + @ApiOperation("查询App稳态越限监测点") + @ApiImplicitParam(name = "param", value = "事件查询参数", required = true) + public HttpResult> queryAppHarmonicLine(@RequestBody LineParamDTO param) { + String methodDescribe = getMethodDescribe("queryAppHarmonicLine"); + Page result = csHarmonicService.queryAppHarmonicLine(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java index 3c1973e..dcabe21 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java @@ -7,12 +7,14 @@ 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.mapper.CsEventUserPOMapper; import com.njcn.csharmonic.param.CldWarnParam; import com.njcn.csharmonic.param.CsEventUserQueryPage; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.po.CsEventPO; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO; import com.njcn.csharmonic.service.CsEventUserPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -40,7 +42,10 @@ import java.util.List; @Api(tags = "事件") @AllArgsConstructor public class EventUserController extends BaseController { + private final CsEventUserPOService csEventUserPOService; + private final CsEventUserPOMapper csEventUserPOMapper; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryEvent") @ApiOperation("暂降事件未读消息") @@ -120,4 +125,54 @@ public class EventUserController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryTempEvent") + @ApiOperation("查询暂态事件(未读)") + @ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true) + public HttpResult> queryTempEvent(@RequestBody CsEventUserQueryParam param) { + String methodDescribe = getMethodDescribe("queryTempEvent"); + List result = csEventUserPOMapper.queryTempEvent(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds()); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryTempHarmonic") + @ApiOperation("查询稳态事件(未读)") + @ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true) + public HttpResult> queryTempHarmonic(@RequestBody CsEventUserQueryParam param) { + String methodDescribe = getMethodDescribe("queryTempEvent"); + List result = csEventUserPOMapper.queryTempHarmonic(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds()); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryAlarmEvent") + @ApiOperation("查询告警事件(未读)") + @ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true) + public HttpResult> queryAlarmEvent(@RequestBody CsEventUserQueryParam param) { + String methodDescribe = getMethodDescribe("queryAlarmEvent"); + List result = csEventUserPOMapper.queryAlarmEvent(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds()); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryRunEvent") + @ApiOperation("查询运行事件(未读)") + @ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true) + public HttpResult> queryRunEvent(@RequestBody CsEventUserQueryParam param) { + String methodDescribe = getMethodDescribe("queryRunEvent"); + List result = csEventUserPOMapper.queryRunEvent(param.getUserId(), param.getStartTime(), param.getEndTime(), param.getEventIds()); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryAppEventCounts") + @ApiOperation("查询App暂态事件总数") + @ApiImplicitParam(name = "param", value = "暂降事件查询参数", required = true) + public HttpResult queryAppEventCounts(@RequestBody CsEventUserQueryPage param) { + String methodDescribe = getMethodDescribe("queryAppEventCounts"); + EventStatisticVO result = csEventUserPOService.queryAppEventCounts(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java index 2342ccf..679fa49 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java @@ -7,6 +7,7 @@ import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.dto.UnReadEventDto; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -35,4 +36,18 @@ public interface CsEventUserPOMapper extends BaseMapper { Page queryEventPageWeb(Page returnpage,@Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage,@Param("devIds") List collect); + + //查询暂态事件(未读) + List queryTempEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); + + //查询稳态事件(未读) + List queryTempHarmonic(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); + + //查询告警事件(未读) + List queryAlarmEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); + + //查询运行事件(未读) + List queryRunEvent(@Param("userId") String userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); + + EventStatisticVO getEventCounts(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); } \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsHarmonicMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsHarmonicMapper.java index 0d2a74a..8c4ebd1 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsHarmonicMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsHarmonicMapper.java @@ -1,7 +1,12 @@ package com.njcn.csharmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.csharmonic.pojo.po.CsHarmonic; +import com.njcn.csharmonic.pojo.vo.HarmonicVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,10 @@ import com.njcn.csharmonic.pojo.po.CsHarmonic; */ public interface CsHarmonicMapper extends BaseMapper { + HarmonicVO getHarmonicCounts(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); + + List getOverDays(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); + + Page getLineHarmonicOverDays(Page page, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List ids); + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml index ea072d8..6120705 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml @@ -250,4 +250,89 @@ order by b.start_time desc + + + + + + + + + + + \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsHarmonicMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsHarmonicMapper.xml new file mode 100644 index 0000000..513ffd6 --- /dev/null +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsHarmonicMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java index a9c843f..0af4864 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java @@ -9,6 +9,7 @@ import com.njcn.csharmonic.pojo.dto.UnReadEventDto; import com.njcn.csharmonic.pojo.po.CsEventPO; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO; import com.njcn.web.pojo.param.BaseParam; import java.util.List; @@ -46,5 +47,6 @@ public interface CsEventUserPOService extends IService{ */ List queryEventListByUserId(String userIndex,List eventList); + EventStatisticVO queryAppEventCounts(CsEventUserQueryPage csEventUserQueryPage); } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsAlarmService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsAlarmService.java index c6b1164..87b1d0e 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsAlarmService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsAlarmService.java @@ -1,5 +1,6 @@ package com.njcn.csharmonic.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.dto.LineParamDTO; import com.njcn.csharmonic.pojo.po.CsAlarm; @@ -17,7 +18,7 @@ import java.util.List; */ public interface ICsAlarmService extends IService { - List queryAlarmList(LineParamDTO param); + Page queryAlarmList(LineParamDTO param); List queryAlarmDetail(LineParamDTO.DevParamDTO param); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicService.java index 2986328..912149a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicService.java @@ -1,5 +1,6 @@ package com.njcn.csharmonic.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.dto.LineParamDTO; import com.njcn.csharmonic.pojo.po.CsHarmonic; @@ -18,8 +19,12 @@ import java.util.List; */ public interface ICsHarmonicService extends IService { - HarmonicVO queryAppList(LineParamDTO param); + Page queryAppList(LineParamDTO param); List queryHarmonicDetail(LineParamDTO param); + HarmonicVO queryAppHarmonicCounts(LineParamDTO param); + + Page queryAppHarmonicLine(LineParamDTO param); + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsAlarmServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsAlarmServiceImpl.java index d17466a..2000352 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsAlarmServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsAlarmServiceImpl.java @@ -1,9 +1,11 @@ package com.njcn.csharmonic.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -53,9 +55,9 @@ public class CsAlarmServiceImpl extends ServiceImpl impl private final EpdFeignClient epdFeignClient; @Override - public List queryAlarmList(LineParamDTO param) { - List result = new ArrayList<>(); - + public Page queryAlarmList(LineParamDTO param) { + Page page1 = new Page<>(); + Page page2 = new Page<> (param.getPageNum(), param.getPageSize()); List lineLedger = csLedgerFeignClient.queryLine(param).getData(); if (CollectionUtil.isNotEmpty(lineLedger)) { List devLedger = new ArrayList<>(); @@ -69,7 +71,6 @@ public class CsAlarmServiceImpl extends ServiceImpl impl }); }); if (CollectionUtil.isNotEmpty(devLedger)) { - List ownerDevList = csCommTerminalFeignClient.getDevIdsByUser(RequestUtil.getUserIndex()).getData(); List devList = devLedger.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList()); @@ -87,14 +88,16 @@ public class CsAlarmServiceImpl extends ServiceImpl impl queryWrapper.ge(StrUtil.isNotBlank(param.getTime()), CsAlarm::getTime, calculateMonthStart(param.getTime())) .le(StrUtil.isNotBlank(param.getTime()), CsAlarm::getTime, calculateMonthEnd(param.getTime())) .orderByDesc(CsAlarm::getTime); - //先获取设备通讯数据 - List list = list(queryWrapper); + Page csAlarmPage = this.baseMapper.selectPage(page2,queryWrapper); + BeanUtil.copyProperties(csAlarmPage, page1); + List list = csAlarmPage.getRecords(); + if (CollectionUtil.isNotEmpty(list)) { //获取用户推送事件 List userEvents = csEventUserPOService.queryEventListByUserId(RequestUtil.getUserIndex(), list.stream().map(CsAlarm::getId).collect(Collectors.toList())); List finalDevList = devList; - result = list.stream() + List result = list.stream() .map(alarm -> { AlarmVO alarmVO = new AlarmVO(); alarmVO.setEventId(alarm.getId()); @@ -114,10 +117,11 @@ public class CsAlarmServiceImpl extends ServiceImpl impl .filter(alarmVO -> alarmVO.getWarnNums() > 0) .sorted((a1, a2) -> a2.getDate().compareTo(a1.getDate())) .collect(Collectors.toList()); + page1.setRecords(result); } } } - return result; + return page1; } @Override 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 e086573..48d5177 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 @@ -499,13 +499,17 @@ public class CsEventPOServiceImpl extends ServiceImpl getEventUser(String devId,boolean isAdmin) { - List adminUser = appUserFeignClient.getAdminInfo().getData(); - List adminList = adminUser.stream().map(User::getId).collect(Collectors.toList()); + List list = csDeviceUserFeignClient.findUserById(devId).getData(); + List result = new ArrayList<>(list); if (isAdmin) { - List list = csDeviceUserFeignClient.findUserById(devId).getData(); - adminList.addAll(list); + List adminUser = appUserFeignClient.getAdminInfo().getData(); + List adminList = adminUser.stream().map(User::getId).collect(Collectors.toList()); + result.addAll(adminList); } - return adminList; + if (CollectionUtil.isNotEmpty(result)) { + result = result.stream().distinct().collect(Collectors.toList()); + } + return result; } /** diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java index 5e69d86..8d8823b 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java @@ -7,10 +7,10 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.constant.LogInfo; +import com.njcn.csdevice.api.CsCommTerminalFeignClient; import com.njcn.csdevice.api.CsDeviceUserFeignClient; import com.njcn.csdevice.api.CsLedgerFeignClient; import com.njcn.csdevice.api.NodeFeignClient; @@ -27,8 +27,8 @@ import com.njcn.csharmonic.pojo.dto.UnReadEventDto; import com.njcn.csharmonic.pojo.po.CsEventPO; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO; import com.njcn.csharmonic.service.CsEventUserPOService; -import com.njcn.harmonic.utils.PublicDataUtils; import com.njcn.influx.pojo.dto.EventDataSetDTO; import com.njcn.influx.service.EvtDataService; import com.njcn.system.api.DicDataFeignClient; @@ -68,6 +68,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl strings = JSONArray.parseArray(role, String.class); + if(CollectionUtils.isEmpty(strings)){ + return result; + } + role=strings.get(0); + if( Objects.equals(role, AppRoleEnum.APP_VIP_USER.getCode())&&Objects.equals(csEventUserQueryPage.getType(),"3")){ + csEventUserQueryPage.setLevel("3"); + } + List data = csLedgerFeignClient.lineTree().getData(); + if (CollectionUtils.isEmpty(data)) { + return result; + } + // 获取第一层节点（根节点），从第二层开始才是真正的工程 + List firstLevelNodes = new ArrayList<>(); + for (CsLedgerVO rootNode : data) { + List children = rootNode.getChildren(); + if (CollectionUtil.isNotEmpty(children)) { + firstLevelNodes.addAll(children); + } + } + if (CollectionUtils.isEmpty(firstLevelNodes)) { + return result; + } + // 缓存查询条件到局部变量 + String engineeringId = csEventUserQueryPage.getEngineeringid(); + String projectId = csEventUserQueryPage.getProjectId(); + String deviceId = csEventUserQueryPage.getDeviceId(); + String lineId = csEventUserQueryPage.getLineId(); + + // 从第二层开始遍历：工程 -> 项目 -> 设备 -> 监测点 + List collect = new ArrayList<>(); + for (CsLedgerVO engineering : firstLevelNodes) { + // 过滤工程 + if (StringUtil.isNotBlank(engineeringId) + && !Objects.equals(engineering.getId(), engineeringId)) { + continue; + } + + List projects = engineering.getChildren(); + if (CollectionUtils.isEmpty(projects)) { + continue; + } + + for (CsLedgerVO project : projects) { + // 过滤项目 + if (StringUtil.isNotBlank(projectId) + && !Objects.equals(project.getId(), projectId)) { + continue; + } + + List devices = project.getChildren(); + if (CollectionUtils.isEmpty(devices)) { + continue; + } + + for (CsLedgerVO device : devices) { + // 过滤设备 + if (StringUtil.isNotBlank(deviceId) + && !Objects.equals(device.getId(), deviceId)) { + continue; + } + + // 如果传了监测点 ID，需要进一步过滤 + if (StringUtil.isNotBlank(lineId)) { + List lines = device.getChildren(); + if (CollectionUtil.isNotEmpty(lines)) { + boolean hasLine = lines.stream() + .anyMatch(line -> Objects.equals(line.getId(), lineId)); + if (hasLine) { + collect.add(device.getId()); + } + } + } else { + // 没有传监测点 ID，直接添加设备 ID + collect.add(device.getId()); + } + } + } + } + if (CollectionUtils.isEmpty(collect)) { + return result; + } else { + result = baseMapper.getEventCounts(csEventUserQueryPage.getStartTime(),csEventUserQueryPage.getEndTime(),collect); + } + return result; + } } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicServiceImpl.java index 3498bfd..9d0425f 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicServiceImpl.java @@ -1,9 +1,11 @@ package com.njcn.csharmonic.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -30,7 +32,6 @@ import org.springframework.stereotype.Service; import java.lang.reflect.Field; import java.text.DecimalFormat; -import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -46,13 +47,22 @@ import java.util.stream.Collectors; @Service public class CsHarmonicServiceImpl extends ServiceImpl implements ICsHarmonicService { + private static final Map VALUE_TYPE_MAP = new HashMap() {{ + put("max", "最大值"); + put("min", "最小值"); + put("avg", "平均值"); + put("cp95", "95%概率值"); + }}; + private final CsLedgerFeignClient csLedgerFeignClient; private final CsEventUserPOService csEventUserPOService; private final IRStatLimitRateDetailDService rStatLimitRateDetailDService; private final CsCommTerminalFeignClient csCommTerminalFeignClient; @Override - public HarmonicVO queryAppList(LineParamDTO param) { + public Page queryAppList(LineParamDTO param) { + Page result = new Page<>(); + Page page = new Page<> (param.getPageNum(), param.getPageSize()); HarmonicVO vo = new HarmonicVO(); List lineLedger = csLedgerFeignClient.queryLine(param).getData(); if (CollectionUtil.isNotEmpty(lineLedger)) { @@ -73,23 +83,17 @@ public class CsHarmonicServiceImpl extends ServiceImpl csHarmonicPage = this.baseMapper.selectPage(page,queryWrapper); + BeanUtil.copyProperties(csHarmonicPage, result); + list = csHarmonicPage.getRecords(); } + if (CollectionUtil.isNotEmpty(list)) { //获取所有台账数据 List ledgers = csLedgerFeignClient.getAllLedger().getData(); Map ledgerMap = ledgers.stream().collect(Collectors.toMap(CsLedgerVO::getId, item->item)); List lineHarmonicDetails = new ArrayList<>(); - vo.setHarmonicNums(list.size()); - //获取越限天数 - Set distinctTimes = list.stream().map(CsHarmonic::getTime).filter(Objects::nonNull).collect(Collectors.toSet()); - int overDay = distinctTimes.size(); - vo.setOverDays(overDay); - //获取监测点 - Set distinctLineIds = list.stream().map(CsHarmonic::getLineId).collect(Collectors.toSet()); - int overLine = distinctLineIds.size(); - vo.setOverLineNums(overLine); //获取用户推送事件 List userEvents = csEventUserPOService.queryEventListByUserId(RequestUtil.getUserIndex(), list.stream().map(CsHarmonic::getId).collect(Collectors.toList())); list.forEach(item->{ @@ -107,9 +111,10 @@ public class CsHarmonicServiceImpl extends ServiceImpl lineLedger = csLedgerFeignClient.queryLine(param).getData(); + if (CollectionUtil.isNotEmpty(lineLedger)) { + List lineIds = lineLedger.stream().map(CsLedger::getId).collect(Collectors.toList()); + //根据用户获取设备数据权限 + List ownerList = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData(); + List combinedLineIds = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(ownerList)) { + combinedLineIds = lineIds.stream() + .filter(ownerList::contains) + .distinct() + .collect(Collectors.toList()); + } + if (CollectionUtil.isNotEmpty(combinedLineIds)) { + //查询数量 + vo = this.baseMapper.getHarmonicCounts( + PublicDataUtils.calculateMonthStart(param.getTime()) + ,PublicDataUtils.calculateMonthEnd(param.getTime()) + ,combinedLineIds); + //查询日期 + List overDays = this.baseMapper.getOverDays( + PublicDataUtils.calculateMonthStart(param.getTime()) + ,PublicDataUtils.calculateMonthEnd(param.getTime()) + ,combinedLineIds); + vo.setOverDaysList(overDays); + } + } + return vo; + } + + @Override + public Page queryAppHarmonicLine(LineParamDTO param) { + Page page = new Page<> (param.getPageNum(), param.getPageSize()); + List lineLedger = csLedgerFeignClient.queryLine(param).getData(); + if (CollectionUtil.isNotEmpty(lineLedger)) { + List lineIds = lineLedger.stream().map(CsLedger::getId).collect(Collectors.toList()); + //根据用户获取设备数据权限 + List ownerList = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData(); + List combinedLineIds = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(ownerList)) { + combinedLineIds = lineIds.stream() + .filter(ownerList::contains) + .distinct() + .collect(Collectors.toList()); + } + if (CollectionUtil.isNotEmpty(combinedLineIds)) { + page = this.baseMapper.getLineHarmonicOverDays(page + ,PublicDataUtils.calculateMonthStart(param.getTime()) + ,PublicDataUtils.calculateMonthEnd(param.getTime()) + ,combinedLineIds); + List lineHarmonicOverDays = page.getRecords(); + if (CollectionUtil.isNotEmpty(lineHarmonicOverDays)) { + //获取所有台账数据 + List ledgers = csLedgerFeignClient.getAllLedger().getData(); + Map ledgerMap = ledgers.stream().collect(Collectors.toMap(CsLedgerVO::getId, item->item)); + lineHarmonicOverDays.forEach(item->{ + CsLedger ledger = lineLedger.stream().filter(item1->item1.getId().equals(item.getLineId())).findFirst().orElse(null); + item.setEngineeringName(ledgerMap.get(ledger.getPids().split(",")[1]).getName()); + item.setProjectName(ledgerMap.get(ledger.getPids().split(",")[2]).getName()); + item.setDevName(ledgerMap.get(ledger.getPids().split(",")[3]).getName()); + item.setLineId(item.getLineId()); + item.setLineName(ledger.getName()); + item.setTimeList(Arrays.asList(item.getTimeString().split(", "))); + }); + //对告警天数进行降序排序 + lineHarmonicOverDays.sort((item1, item2) -> { + int size1 = item1.getTimeList() != null ? item1.getTimeList().size() : 0; + int size2 = item2.getTimeList() != null ? item2.getTimeList().size() : 0; + return Integer.compare(size2, size1); + }); + page.setRecords(lineHarmonicOverDays); + } + } + } + return page; + } + /** * 添加谐波数据到列表 @@ -221,7 +305,7 @@ public class CsHarmonicServiceImpl extends ServiceImpl> devMap = Objects.isNull(devList) ? new HashMap<>() : devList.stream().collect(Collectors.groupingBy(DevDetailDTO::getEngineeringid)); - // 获取未读事件 - List unReadEventList = csEventUserPOService.queryEngineeringEventCount(RequestUtil.getUserIndex()); - Map> unReadEventMap = Objects.isNull(unReadEventList) ? new HashMap<>() : - unReadEventList.stream().collect(Collectors.groupingBy(UnReadEventDto::getDeviceId)); - // 遍历工程列表，从内存中获取设备数据 engineeringList.forEach(item -> { EngineeringHomePageVO vo = new EngineeringHomePageVO(); @@ -69,19 +65,26 @@ public class HomePageServiceImpl implements HomePageService { vo.setOfflineDevTotal((int) status1Count); vo.setSort(item.getSort()); - // 未读的告警数量 - int alarmTotal = Objects.isNull(devs) ? 0 : devs.stream() - .map(DevDetailDTO::getEquipmentId) - .filter(Objects::nonNull) - .mapToInt(deviceId -> { - List events = unReadEventMap.get(deviceId); - return Objects.isNull(events) ? 0 : events.stream() - .mapToInt(UnReadEventDto::getCount) - .sum(); - }) - .sum(); - vo.setAlarmTotal(alarmTotal); + // 获取项目事件数量 + int alarmTotal = 0; + if (CollectionUtil.isNotEmpty(devs) && !Objects.isNull(devs)) { + // 获取暂态未读事件 + List allLineIds = devs.stream() + .filter(dev -> CollectionUtil.isNotEmpty(dev.getLineList())) + .flatMap(dev -> dev.getLineList().stream()) + .distinct() + .collect(Collectors.toList()); + List tempEventList = csEventUserPOMapper.queryTempEvent(RequestUtil.getUserIndex(),"","",allLineIds); + alarmTotal = alarmTotal + (CollectionUtil.isNotEmpty(tempEventList)?tempEventList.size():0); + + // 获取稳态未读事件 + if (CollectionUtil.isNotEmpty(allLineIds)) { + List tempHarmonicList = csEventUserPOMapper.queryTempHarmonic(RequestUtil.getUserIndex(),"","",allLineIds); + alarmTotal = alarmTotal + (CollectionUtil.isNotEmpty(tempHarmonicList)?tempHarmonicList.size():0); + } + } + vo.setAlarmTotal(alarmTotal); result.add(vo); }); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java index 73fa5fd..bf34022 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java @@ -48,7 +48,7 @@ public class RealDataServiceImpl implements RealDataService { //判断设备类型 治理无线设备需要判断mqtt、云前置设备直接判断设备运行状态 CsEquipmentDeliveryPO dev = equipmentFeignClient.getDevByLineId(lineId).getData(); String devModelCode = dictTreeFeignClient.queryById(dev.getDevType()).getData().getCode(); - if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) { + if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) { if (dev.getRunStatus() == 1) { throw new BusinessException("装置离线"); } @@ -63,7 +63,7 @@ public class RealDataServiceImpl implements RealDataService { //获取装置所用模板 CsLinePO po = csLineFeignClient.getById(lineId).getData(); String modelId = po.getDataModelId(); - if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) { + if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) { CsDataSet csDataSet = dataSetFeignClient.getBaseDataSet(modelId,1).getData(); askDeviceDataFeignClient.askCldRealData(dev.getId(),lineId,dev.getNodeId(),csDataSet.getIdx()); updateRedisUserSet("rtDataUserId:" + lineId, RequestUtil.getUserIndex(), 600L); @@ -76,7 +76,7 @@ public class RealDataServiceImpl implements RealDataService { //等待装置响应,获取询问结果 Thread.sleep(5000); Object object; - if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) { + if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) { object = redisUtil.getObjectByKey("devResponse:" + lineId); } else { object = redisUtil.getObjectByKey("devResponse"); @@ -105,7 +105,7 @@ public class RealDataServiceImpl implements RealDataService { //判断设备类型 治理无线设备需要判断mqtt、云前置设备直接判断设备运行状态 CsEquipmentDeliveryPO dev = equipmentFeignClient.getDevByLineId(lineId).getData(); String devModelCode = dictTreeFeignClient.queryById(dev.getDevType()).getData().getCode(); - if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) { + if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) { if (dev.getRunStatus() == 1) { throw new BusinessException("装置离线"); } @@ -121,7 +121,7 @@ public class RealDataServiceImpl implements RealDataService { CsLinePO po = csLineFeignClient.getById(lineId).getData(); String modelId = po.getDataModelId(); //根据指标来获取不同的数据集 - if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) { + if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) { CsDataSet csDataSet = dataSetFeignClient.getHarmonicDataSet(modelId,1,target).getData(); askDeviceDataFeignClient.askCldRealData(dev.getId(),lineId,dev.getNodeId(),csDataSet.getIdx()); } else { @@ -131,7 +131,7 @@ public class RealDataServiceImpl implements RealDataService { //等待装置响应,获取询问结果 Thread.sleep(2000); Object object; - if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode)) { + if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) { object = redisUtil.getObjectByKey("devResponse:" + lineId); } else { object = redisUtil.getObjectByKey("devResponse"); diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/CsAppReportController.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/CsAppReportController.java index be3491f..0388799 100644 --- a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/CsAppReportController.java +++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/controller/CsAppReportController.java @@ -1,6 +1,7 @@ package com.njcn.csreport.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; @@ -71,9 +72,9 @@ public class CsAppReportController extends BaseController { @PostMapping("/getApplicationReport") @ApiOperation("查询暂态报告申请记录") @ApiImplicitParam(name = "param", value = "事件查询参数", required = true) - public HttpResult> getApplicationReportList(@RequestBody LineParamDTO param) { + public HttpResult> getApplicationReportList(@RequestBody LineParamDTO param) { String methodDescribe = getMethodDescribe("getApplicationReportList"); - List result = csAppReportService.getApplicationReportList(param); + Page result = csAppReportService.getApplicationReportList(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/ICsAppReportService.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/ICsAppReportService.java index 0e9399e..729c6b6 100644 --- a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/ICsAppReportService.java +++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/ICsAppReportService.java @@ -1,5 +1,6 @@ package com.njcn.csreport.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.dto.LineParamDTO; import com.njcn.csreport.pojo.po.CsAppReport; @@ -24,7 +25,7 @@ public interface ICsAppReportService extends IService { void applicationReport(LineParamDTO param); - List getApplicationReportList(LineParamDTO param); + Page getApplicationReportList(LineParamDTO param); Boolean createEventReport(String id); diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java index 814aed5..4092117 100644 --- a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java +++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java @@ -3,10 +3,12 @@ package com.njcn.csreport.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.util.IdUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.CsCommTerminalFeignClient; @@ -22,7 +24,9 @@ import com.njcn.csharmonic.api.SysExcelRelationFeignClient; import com.njcn.csharmonic.enums.CsHarmonicResponseEnum; import com.njcn.csharmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.csharmonic.pojo.po.CsEventPO; +import com.njcn.csharmonic.pojo.po.CsHarmonic; import com.njcn.csharmonic.pojo.po.RStatLimitRateDPO; +import com.njcn.csharmonic.pojo.vo.HarmonicVO; import com.njcn.csreport.mapper.CsAppReportMapper; import com.njcn.csreport.pojo.po.CsAppReport; import com.njcn.csreport.pojo.vo.ReportEventVO; @@ -52,10 +56,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; -import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -97,12 +102,11 @@ public class CsAppReportServiceImpl extends ServiceImpl getApplicationReportList(LineParamDTO param) { + public Page getApplicationReportList(LineParamDTO param) { + Page page = new Page<>(); + Page page1 = new Page<> (param.getPageNum(), param.getPageSize()); + + List result = new ArrayList<>(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.between(CsAppReport::getCreateTime, param.getStartTime(), param.getEndTime()) @@ -211,7 +219,11 @@ public class CsAppReportServiceImpl extends ServiceImpl list = this.list(queryWrapper); + Page page2 = this.baseMapper.selectPage(page1,queryWrapper); + BeanUtil.copyProperties(page2, page); + List list = page2.getRecords(); + +// List list = this.list(queryWrapper); if (CollUtil.isNotEmpty(list)) { list.forEach(item->{ ReportEventVO vo = new ReportEventVO(); @@ -235,9 +247,10 @@ public class CsAppReportServiceImpl extends ServiceImpl lineList = csLineFeignClient.queryLineById(lineIdList).getData(); Map lineMap = lineList.stream().collect(Collectors.toMap(CsLinePO::getLineId, item->item)); Map map = new HashMap<>(); + AtomicReference lineName = new AtomicReference<>(); eventList.forEach(item->{ CsLinePO po = lineMap.get(item.getLineId()); AreaLineInfoVO vo = new AreaLineInfoVO(); @@ -281,6 +295,7 @@ public class CsAppReportServiceImpl extends ServiceImpl splitIntoWeeks(LocalDate startDate, LocalDate endDate) { - List weekRanges = new java.util.ArrayList<>(); - LocalDate currentStart = startDate; + private List splitIntoMonthsForCurrentYear(LocalDate endDate) { + List timeRanges = new ArrayList<>(); + LocalDate now = LocalDate.now(); + int currentYear = now.getYear(); - while (!currentStart.isAfter(endDate)) { - LocalDate currentEnd = currentStart.with(DayOfWeek.SUNDAY); - if (currentEnd.isAfter(endDate)) { - currentEnd = endDate; + for (int month = now.getMonthValue(); month >= 1; month--) { + LocalDate monthStart = LocalDate.of(currentYear, month, 1); + LocalDate monthEnd; + + if (month == now.getMonthValue()) { + monthEnd = now; + } else { + monthEnd = monthStart.withDayOfMonth(monthStart.lengthOfMonth()); } - weekRanges.add(new TimeRange(currentStart, currentEnd)); - currentStart = currentEnd.plusDays(1); + + timeRanges.add(new TimeRange(monthStart, monthEnd)); } - - return weekRanges; - } - - - private List splitIntoMonths(LocalDate startDate, LocalDate endDate) { - List timeRanges = new java.util.ArrayList<>(); - LocalDate currentStart = startDate.withDayOfMonth(1); - - while (!currentStart.isAfter(endDate)) { - LocalDate currentEnd = currentStart.withDayOfMonth(currentStart.lengthOfMonth()); - if (currentEnd.isAfter(endDate)) { - currentEnd = endDate; - } - timeRanges.add(new TimeRange(currentStart, currentEnd)); - currentStart = currentEnd.plusDays(1); - } - return timeRanges; } + //fixme 代码较为冗余，后期可以采用反射的方式进行优化 private String buildOverLimitDesc(List dataList) { String tag = "";