Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

台账模块调整

Browse Source
This commit is contained in:
雨木c
2023-04-24 20:11:35 +08:00
parent 93e4c8c7c0
commit f32790abba
59 changed files with 352 additions and 5032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/DeptLineGeneralClient.java Normal file
View File

@@ -0,0 +1,36 @@
package com.njcn.device.biz.commApi;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.biz.commApi.fallback.DeptLineGeneralClientFallbackFactory;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
*
* @author cdf
* @date 2023/4/24
*/
@FeignClient(
value = ServerInfo.DEVICE,
path = "commTerminal",
fallbackFactory = DeptLineGeneralClientFallbackFactory.class)
public interface DeptLineGeneralClient {
/**
* 通过部门获取所有子集部门所拥有的监测点
*
* @param deptGetLineParam
* @return 指定的部门监测点信息
*/
@PostMapping("/deptGetLineIds")
HttpResult<List<DeptGetChildrenDTO>> deptGetLineList(@RequestBody DeptGetLineParam deptGetLineParam);
}

43
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/DeptLineGeneralClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,43 @@
package com.njcn.device.biz.commApi.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.device.biz.commApi.DeptLineGeneralClient;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* 告警管理熔断降级
* @author yzh
* @date 2022/9/19
*/
@Slf4j
@Component
public class DeptLineGeneralClientFallbackFactory implements FallbackFactory<DeptLineGeneralClient> {
@Override
public DeptLineGeneralClient create(Throwable throwable) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (throwable.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) throwable.getCause();
exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new DeptLineGeneralClient() {
@Override
public HttpResult<List<DeptGetChildrenDTO>> deptGetLineList(DeptGetLineParam deptGetLineParam) {
log.error("{}异常，降级处理，异常为：{}", "获取终获取告警策略列表", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/DeviceResponseEnum.java → pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/DeviceResponseEnum.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pq.enums;
package com.njcn.device.biz.enums;
import lombok.Getter;

24
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetChildrenDTO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.device.biz.pojo.dto;
import lombok.Data;
import java.util.List;
/**
* pqs
*
* @author cdf
* @date 2023/4/24
*/
@Data
public class DeptGetChildrenDTO {
private String deptId;
private String deptName;
private List<String> deptChildren;
private List<String> lineIds;
}

28
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java Normal file
View File

@@ -0,0 +1,28 @@
package com.njcn.device.biz.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* pqs
*
* @author cdf
* @date 2023/4/24
*/
@Data
public class DeptGetLineParam {
@NotBlank(message = "部门id不可为空")
@ApiModelProperty(name = "deptId",value = "部门id")
private String deptId;
@NotBlank(message = "系统类型不可为空")
@ApiModelProperty(name = "serverName",value = "系统类型 0.event-boot 1.harmonic-boot")
private String serverName;
}

5
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DeviceEnumUtil.java → pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/DeviceEnumUtil.java
View File

@@ -1,11 +1,12 @@
package com.njcn.device.pq.utils;
package com.njcn.device.biz.utils;
import cn.hutool.core.util.StrUtil;
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.common.utils.EnumUtils;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import javax.validation.constraints.NotNull;
import java.util.Objects;

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/AlarmClientFallbackFactory.java
View File

@@ -5,7 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pq.api.AlarmClient;
import com.njcn.device.pq.pojo.vo.AlarmStrategyVO;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeptLineFeignClientFallbackFactory.java
View File

@@ -4,7 +4,7 @@ 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.device.pq.api.DeptLineFeignClient;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/DeviceTreeClientFallbackFactory.java
View File

@@ -5,7 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pq.api.DeviceTreeClient;
import com.njcn.device.pq.pojo.vo.TerminalTree;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/GeneralDeviceInfoClientFallbackFactory.java
View File

@@ -8,9 +8,8 @@ import com.njcn.device.pq.pojo.bo.BaseLineInfo;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.po.OnlineRate;
import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
View File

@@ -11,7 +11,7 @@ import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.device.pq.pojo.vo.*;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

6
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/PqsTerminalLogsClientFallbackFactory.java
View File

@@ -4,16 +4,12 @@ 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.device.pq.api.PqsTerminalLogsClient;
import com.njcn.device.pq.api.TerminalBaseClient;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author zbj
* @version 1.0.0

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/SubstationFeignClientFallbackFactory.java
View File

@@ -5,7 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pq.api.SubstationFeignClient;
import com.njcn.device.pq.pojo.dto.SubstationDTO;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java
View File

@@ -5,8 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pq.api.TerminalBaseClient;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
import com.njcn.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

119
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java Normal file
View File

@@ -0,0 +1,119 @@
package com.njcn.device.pq.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.TimeInterval;
import com.njcn.common.pojo.enums.common.ServerEnum;
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.common.utils.EnumUtils;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.pq.service.DeptLineService;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
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.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* pqs
*
* @author cdf
* @date 2023/4/24
*/
@RestController
@RequestMapping("commTerminal")
@RequiredArgsConstructor
@Slf4j
@Api(tags = "通用台账-所有子孙部门以及监测点")
public class CommTerminalController extends BaseController {
private final DeptFeignClient deptFeignClient;
private final DeptLineService deptLineService;
/**
* 通过部门获取所有子集部门所拥有的监测点
*
* @author cdf
* @date 2023/4/24
*/
@PostMapping("deptGetLineIds")
@ApiImplicitParam(name = "deptGetLineParam", value = "请求体", required = true)
public HttpResult<List<DeptGetChildrenDTO>> deptGetLineList(@RequestBody @Validated DeptGetLineParam deptGetLineParam) {
TimeInterval timer = new TimeInterval();
String methodDescribe = getMethodDescribe("deptGetLineList");
List<DeptGetChildrenDTO> all = new ArrayList<>();
List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptGetLineParam.getDeptId(), Stream.of(0, 1).collect(Collectors.toList())).getData();
getAllChildren(deptGetLineParam.getDeptId(), deptDTOList, all);
Map<String, List<String>> map = deptLineService.getLineByDeptRelation(filterDataType(deptGetLineParam.getServerName()));
all.forEach(item -> {
List<String> itemDeptChildren = item.getDeptChildren();
if (CollectionUtil.isNotEmpty(itemDeptChildren)) {
List<String> lineIds = new ArrayList<>();
itemDeptChildren.forEach(i -> {
if (map.containsKey(i)) {
lineIds.addAll(map.get(i));
}
});
item.setLineIds(lineIds);
}
});
log.info("运行时长" + timer.intervalRestart());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, all, methodDescribe);
}
/**
* 获取指定部门所有子孙部门id
*
* @author cdf
* @date 2023/4/24
*/
private void getAllChildren(String deptId, List<DeptDTO> deptAllList, List<DeptGetChildrenDTO> res) {
deptAllList.stream().filter(item -> item.getPid().equals(deptId)).forEach(it -> {
List<String> deptChildren = deptAllList.stream().filter(deptDTO -> deptDTO.getPids().contains(it.getId())).map(DeptDTO::getId).collect(Collectors.toList());
deptChildren.add(it.getId());
DeptGetChildrenDTO generalDeviceDTO = new DeptGetChildrenDTO();
generalDeviceDTO.setDeptId(it.getId());
generalDeviceDTO.setDeptName(it.getName());
generalDeviceDTO.setDeptChildren(deptChildren);
res.add(generalDeviceDTO);
getAllChildren(it.getId(), deptAllList, res);
});
}
/**
* 筛选数据类型
*/
private Integer filterDataType(String serverName) {
ServerEnum serverEnum = EnumUtils.getServerEnumByName(serverName);
switch (serverEnum) {
case EVENT:
return 0;
case HARMONIC:
return 1;
default:
throw new BusinessException(CommonResponseEnum.INVALID_PARAMETER);
}
}
}

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
View File

@@ -7,7 +7,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.*;
import com.njcn.device.pq.pojo.dto.*;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
@@ -16,8 +16,6 @@ import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.po.*;
import com.njcn.device.pq.pojo.vo.*;
import com.njcn.device.pq.service.LineService;
import com.njcn.device.pq.service.impl.GeneralDeviceService;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
View File

@@ -12,7 +12,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.LogUtil;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.LineDetailMapper;
import com.njcn.device.pq.mapper.LineMapper;
import com.njcn.device.pq.mapper.OverlimitMapper;
@@ -45,7 +45,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
View File

@@ -61,4 +61,7 @@ public interface DeptLineService extends IService<DeptLine> {
* @Date: 2022/10/19
*/
Map<String, List<String>> getLineByDeptRelation(Integer devDataType);
}

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/AlarmStrategyServiceImpl.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.AlarmStrategyMapper;
import com.njcn.device.pq.pojo.param.AlarmStrategyParam;
import com.njcn.device.pq.pojo.po.AlarmStrategy;

7
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
View File

@@ -81,13 +81,8 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
*/
@Override
public Map<String, List<String>> getLineByDeptRelation(Integer devDataType) {
Map<String, List<String>> map = new HashMap<> ();
List<DeptLine> deptLines = deptLineMapper.getLineByDeptRelation(devDataType);
Map<String, List<String>> collect = deptLines.stream ( ).collect (Collectors.groupingBy (DeptLine::getId, Collectors.mapping (DeptLine::getLineId,Collectors.toList ())));
return collect;
return deptLines.stream ( ).collect (Collectors.groupingBy (DeptLine::getId, Collectors.mapping (DeptLine::getLineId,Collectors.toList ())));
}

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.FlowMealMapper;
import com.njcn.device.pq.mapper.RateOfFlowMapper;
import com.njcn.device.pq.pojo.param.FlowMealParam;

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowStrategyServiceImpl.java
View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.FlowStrategyDicMapper;
import com.njcn.device.pq.mapper.FlowStrategyMapper;
import com.njcn.device.pq.mapper.RateOfFlowMapper;

7
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
View File

@@ -9,7 +9,7 @@ import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pq.api.AlarmClient;
import com.njcn.device.pq.api.GeneralDeviceInfoClient;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.mapper.LineIntegrityDataMapper;
import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
@@ -21,17 +21,13 @@ import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.po.LineDataIntegrity;
import com.njcn.device.pq.pojo.vo.AlarmStrategyVO;
import com.njcn.device.pq.pojo.vo.LineIntegrityDataVO;
import com.njcn.device.pq.pojo.vo.LineIntegrityDataVO;
import com.njcn.device.pq.pojo.vo.RStatIntegrityVO;
import com.njcn.device.pq.service.LineIntegrityDataService;
import com.njcn.device.pq.utils.DataStatisticsUtil;
import com.njcn.harmonic.pojo.vo.IntegrityIconVO;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDBCommUtils;
import com.njcn.influxdb.utils.InfluxDbUtils;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.enums.StatisticsEnum;
import com.njcn.system.pojo.po.DictData;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.influxdb.dto.QueryResult;
@@ -43,7 +39,6 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.Collator;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineMarkServiceImpl.java
View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.LineDetailMapper;
import com.njcn.device.pq.mapper.LineMarkMapper;
import com.njcn.device.pq.pojo.bo.excel.LineMark;

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -14,7 +13,7 @@ import com.njcn.common.pojo.enums.common.ServerEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.EnumUtils;
import com.njcn.common.utils.PubUtils;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.dto.PollutionLineDTO;

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/NodeServiceImpl.java
View File

@@ -11,7 +11,7 @@ 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.db.constant.DbConstant;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.NodeMapper;
import com.njcn.device.pq.pojo.bo.excel.NodeExcel;
import com.njcn.device.pq.pojo.param.NodeParam;

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ProgramVersionServiceImpl.java
View File

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.ProgramVersionMapper;
import com.njcn.device.pq.mapper.VersionMapper;
import com.njcn.device.pq.pojo.po.Version;

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -18,7 +18,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.LogUtil;
import com.njcn.common.utils.PubUtils;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.mapper.*;
import com.njcn.device.pq.pojo.bo.BaseLineInfo;
@@ -41,7 +41,6 @@ import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.Area;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.pojo.vo.UserVO;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

14
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java
View File

@@ -3,14 +3,11 @@ package com.njcn.device.pq.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.graphbuilder.math.func.AvgFunction;
import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pq.api.AlarmClient;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.mapper.RStatOnlinerateDMapper;
import com.njcn.device.pq.mapper.TerminalOnlineRateDataMapper;
@@ -25,27 +22,18 @@ import com.njcn.device.pq.pojo.vo.AlarmStrategyVO;
import com.njcn.device.pq.pojo.vo.OnlineRateCensusVO;
import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO;
import com.njcn.device.pq.service.IRStatOnlinerateDService;
import com.njcn.device.pq.service.TerminalOnlineRateDataService;
import com.njcn.device.pq.utils.DataStatisticsUtil;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDBCommUtils;
import com.njcn.influxdb.utils.InfluxDbUtils;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.enums.StatisticsEnum;
import com.njcn.system.pojo.po.DictData;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.influxdb.dto.QueryResult;
import org.influxdb.impl.InfluxDBResultMapper;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java
View File

@@ -1,9 +1,8 @@
package com.njcn.device.pq.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.mapper.DevVersionMapper;
import com.njcn.device.pq.mapper.TerminalVersionMapper;
import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -33,7 +33,7 @@ import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pq.api.GeneralDeviceInfoClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
@@ -54,7 +54,6 @@ import com.njcn.event.service.majornetwork.ReportService;
import com.njcn.event.utils.EchartsUtil;
import com.njcn.event.utils.FreemarkerUtil;
import com.njcn.event.utils.WordUtils;
import com.njcn.influxdb.mapper.InfluxDBResultMapperCn;
import com.njcn.influxdb.utils.InfluxDBCommUtils;
import com.njcn.influxdb.utils.InfluxDbUtils;
import com.njcn.poi.util.PoiUtil;
@@ -99,7 +98,6 @@ import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalField;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java
View File

@@ -49,7 +49,7 @@ public class AnalyzeController extends BaseController {
private final IHarmonicService harmonicService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
/* @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getLineRank")
@ApiOperation("污区图-获取前十监测点排名")
@ApiImplicitParam(name = "param", value = "实体参数", required = true)
@@ -58,7 +58,7 @@ public class AnalyzeController extends BaseController {
LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
List<PollutionLineDTO> list = pollutionService.getLineRank(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/deptSubRelations")

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IPollutionService.java
View File

@@ -49,5 +49,5 @@ public interface IPollutionService {
* @author xy
* @date 2022/2/22 10:04
*/
List<PollutionLineDTO> getLineRank(HarmonicPublicParam param);
// List<PollutionLineDTO> getLineRank(HarmonicPublicParam param);
}

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionServiceImpl.java
View File

@@ -175,7 +175,7 @@ public class PollutionServiceImpl implements IPollutionService {
return list.stream().sorted(Comparator.comparing(PollutionLineDTO::getData).reversed().thenComparing(PollutionLineDTO::getName)).collect(Collectors.toList());
}
*/
@Override
/* @Override
public List<PollutionLineDTO> getLineRank(HarmonicPublicParam harmonicPublicParam) {
harmonicPublicParam.setServerName(generalInfo.getMicroServiceName());
List<PollutionLineDTO> list = new ArrayList<>();
@@ -206,7 +206,7 @@ public class PollutionServiceImpl implements IPollutionService {
return list.subList(Param.DOWN_LIMIT, Param.UP_LIMIT);
}
return list;
}
}*/
/**

2482
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java
View File

File diff suppressed because it is too large Load Diff

7
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmAberrationRateJob.java
View File

@@ -1,6 +1,7 @@
package com.njcn.executor.handler;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.executor.utils.CommonExecutorUtils;
import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient;
import com.njcn.prepare.harmonic.api.line.DistortionRateFeignClient;
@@ -27,11 +28,9 @@ public class HarmAberrationRateJob {
@XxlJob("harmAberrationRateHandler")
public void harmAberrationRateHandler(){
String command = XxlJobHelper.getJobParam();
LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(command));
String date = CommonExecutorUtils.prepareTimeDeal(command);
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
String date = CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY);
//date = "2022-10-26";
lineParam.setDataDate(date);
lineParam.setDataSource(1);

1400
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java
View File

File diff suppressed because it is too large Load Diff

1015
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java
View File

File diff suppressed because it is too large Load Diff

31
pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java
View File

@@ -25,36 +25,9 @@ public class CommonExecutorUtils {
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String date = null;
Calendar calendar = Calendar.getInstance();
switch (command){
case BizParamConstant.STAT_BIZ_YEAR :
calendar.add(Calendar.YEAR,-1);
date = sdf.format(DateUtil.beginOfYear(calendar.getTime()));
break;
case BizParamConstant.STAT_BIZ_MONTH:
//月
calendar.add(Calendar.DAY_OF_MONTH,-1);
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
break;
case BizParamConstant.STAT_BIZ_QUARTER:
//季度
calendar.add(Calendar.MONTH,-3);
date = sdf.format(DateUtil.beginOfQuarter(calendar.getTime()));
break;
case BizParamConstant.STAT_BIZ_WEEK:
calendar.add(Calendar.WEEK_OF_MONTH,-1);
date = sdf.format(DateUtil.beginOfWeek(calendar.getTime()));
break;
case BizParamConstant.STAT_BIZ_DAY:
calendar.add(Calendar.DAY_OF_MONTH,-1);
date = sdf.format(DateUtil.beginOfDay(calendar.getTime()));
break;
default:
throw new IllegalStateException("Unexpected value: " + command);
}
return date;
log.info("job调度时间:"+sdf.format(calendar.getTime()));
return sdf.format(calendar.getTime());
}
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/device/fallback/DeviceAbnormalFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.device.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.device.DeviceAbnormalFeignClient;
import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.DayDataFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.DistortionRateFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.HarmonicGeneralFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.HarmonicMetricFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.NormalLimitFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.PollutionFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/ThsSuperviseClientFallbackFactory.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.ThsSuperviseClient;
import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
import feign.hystrix.FallbackFactory;

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/LineParam.java
View File

@@ -22,9 +22,11 @@ public class LineParam {
private Integer lineType;
@ApiModelProperty(name = "type",value = "时间类型（1年，2季，3月，4周，5日）")
@NotNull(message = "时间类型不可为空")
private Integer type;
@ApiModelProperty(name = "dataDate",value = "时间")
@NotBlank(message = "时间不可为空")
private String dataDate;
@ApiModelProperty(name = "dataSource",value = "数据源（0:oracle，1:influxdb 2:mysql）")

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DataExceptionController.java
View File

@@ -6,7 +6,7 @@ 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.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import com.njcn.prepare.harmonic.service.mysql.line.DataExceptionService;
import com.njcn.web.controller.BaseController;

7
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java
View File

@@ -50,6 +50,13 @@ public class DistortionRateController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/distortionRateBySource")
@ApiOperation("谐波畸变率排名")

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DataExceptionServiceImpl.java
View File

@@ -8,7 +8,7 @@ import com.njcn.device.pms.api.MonitorClient;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pq.constant.Param;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.pojo.po.DataV;
import com.njcn.device.pq.pojo.po.PmsAbnormalRules;
import com.njcn.device.pq.pojo.po.RStatAbnormalD;

38
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java
View File

@@ -7,8 +7,12 @@ import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.LogUtil;
import com.njcn.device.biz.commApi.DeptLineGeneralClient;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.pq.api.DeptLineFeignClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.po.Overlimit;
@@ -23,6 +27,8 @@ import com.njcn.prepare.harmonic.service.mysql.line.PollutionService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.influxdb.dto.QueryResult;
@@ -77,9 +83,14 @@ public class PollutionServiceImpl implements PollutionService {
private final RMpPollutionDMapper rMpPollutionDMapper;
private final DeptLineGeneralClient deptLineGeneralClient;
private final DeptFeignClient deptFeignClient;
@Override
@Async("asyncExecutor")
public void processPollutionData(LineParam lineParam) {
TimeInterval timer = new TimeInterval();
List<PollutionDTO> pollutionList;
LocalDateTime local = LocalDateTimeUtil.now();
@@ -135,12 +146,12 @@ public class PollutionServiceImpl implements PollutionService {
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
}else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(lineParam.getType())){
Date dateOutb = DateUtil.beginOfQuarter(dateOut);
Date dateOute = DateUtil.endOfQuarter(dateOut);
Date dateOute = dateOut;
local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00");
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
}else if (Integer.valueOf(BizParamConstant.STAT_BIZ_YEAR).equals(lineParam.getType())){
Date dateOutb = DateUtil.beginOfYear(dateOut);
Date dateOute = DateUtil.endOfYear(dateOut);
Date dateOute = dateOut;
local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00");
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
}
@@ -158,11 +169,18 @@ public class PollutionServiceImpl implements PollutionService {
*/
private void insertPolluctionMySql(List<RMpPollutionDPO> pollutionDayList, List<DictData> dictData, LocalDateTime local, Integer type){
HttpResult<Map<String, List<String>>> substationOut = lineFeignClient.getLineBySubstationRelation(1);
HttpResult<Map<String, List<String>>> unitOut = deptLineFeignClient.getLineByDeptRelation(1);
//HttpResult<Map<String, List<String>>> unitOut = deptLineFeignClient.getLineByDeptRelation(1);
Dept dept = deptFeignClient.getRootDept().getData();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(dept.getId());
deptGetLineParam.setServerName(ServerInfo.HARMONIC);
List<DeptGetChildrenDTO> deptGetChildrenDTOList = deptLineGeneralClient.deptGetLineList(deptGetLineParam).getData();
Map<String, List<String>> substationMap = substationOut.getData();
Map<String, List<String>> unitMap = unitOut.getData();
insertSubstation(dictData,substationMap,pollutionDayList,local,type);
insertUnit(dictData,unitMap,pollutionDayList,local,type);
insertUnit(dictData,deptGetChildrenDTOList,pollutionDayList,local,type);
}
/*MySql入表 r_mp_pollution_d*/
@@ -212,11 +230,11 @@ public class PollutionServiceImpl implements PollutionService {
}
/*MySql入表 r_stat_pollution_org*/
private void insertUnit(List<DictData> dictDataList,Map<String, List<String>> unitMap,List<RMpPollutionDPO> pollutionDayList,LocalDateTime local, Integer type){
for (String key : unitMap.keySet()){
private void insertUnit(List<DictData> dictDataList,List<DeptGetChildrenDTO> deptGetChildrenDTOList,List<RMpPollutionDPO> pollutionDayList,LocalDateTime local, Integer type){
for (DeptGetChildrenDTO deptGetChildrenDTO : deptGetChildrenDTOList){
List<RMpPollutionDPO> processList = new ArrayList<>();
List<String> unitList = unitMap.get(key);
for(String lineid : unitList){
for(String lineid : deptGetChildrenDTO.getLineIds()){
for (RMpPollutionDPO pollution : pollutionDayList){
if (lineid.equals(pollution.getLineId())){
processList.add(pollution);
@@ -224,7 +242,7 @@ public class PollutionServiceImpl implements PollutionService {
}
}
Map<String, Object> inMap = new HashMap<>();
inMap.put("orgId",key);
inMap.put("orgId",deptGetChildrenDTO.getDeptId());
inMap.put("dataDate",local);
for (DictData dictData : dictDataList){
processData(dictData, processList, inMap);

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/DataExceptionService.java
View File

@@ -1,7 +1,7 @@
package com.njcn.prepare.harmonic.service.mysql.line;
import com.njcn.device.pq.enums.DeviceResponseEnum;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
/**