1.增加配网用户侧算法适配
2.新增河北用户侧数据完整性接口 3.新增河北用户侧越限详情接口
This commit is contained in:
@@ -4,9 +4,12 @@ import com.njcn.common.pojo.constant.ServerInfo;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.device.pms.api.fallback.DistributionMonitorClientFallbackFactory;
|
||||
import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
|
||||
import com.njcn.device.pms.pojo.param.pwUser.PwUserMonitorParam;
|
||||
import com.njcn.device.pms.pojo.po.DistributionMonitor;
|
||||
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
|
||||
import com.njcn.device.pms.pojo.vo.pwUser.PwUserMonitorDataVO;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
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.RequestParam;
|
||||
@@ -52,4 +55,8 @@ public interface DistributionMonitorClient {
|
||||
@PostMapping("pwMonitorAreaDetailInfo")
|
||||
HttpResult<List<PwPmsMonitorDTO>> pwMonitorAreaDetailInfo(@RequestBody List<String> monitorIds);
|
||||
|
||||
@PostMapping("getPwUserIds")
|
||||
HttpResult<List<PwUserMonitorDataVO>> getPwUserIds(@RequestBody @Validated PwUserMonitorParam pwUserMonitorParam);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -5,8 +5,10 @@ import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.device.pms.api.DistributionMonitorClient;
|
||||
import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
|
||||
import com.njcn.device.pms.pojo.param.pwUser.PwUserMonitorParam;
|
||||
import com.njcn.device.pms.pojo.po.DistributionMonitor;
|
||||
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
|
||||
import com.njcn.device.pms.pojo.vo.pwUser.PwUserMonitorDataVO;
|
||||
import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -59,6 +61,12 @@ public class DistributionMonitorClientFallbackFactory implements FallbackFactory
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
|
||||
@Override
|
||||
public HttpResult<List<PwUserMonitorDataVO>> getPwUserIds(PwUserMonitorParam pwUserMonitorParam) {
|
||||
log.error("{}异常,降级处理,异常为:{}", "根据部门获取配网用户信息", throwable.toString());
|
||||
throw new BusinessException(finalExceptionEnum);
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.njcn.device.pms.pojo.param.pwUser;
|
||||
|
||||
import com.njcn.web.pojo.param.BaseParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class PwUserMonitorParam extends BaseParam {
|
||||
|
||||
@NotBlank(message = "单位id不可为空")
|
||||
private String orgId;
|
||||
|
||||
private String userName;
|
||||
|
||||
private Double limitValue;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.njcn.device.pms.pojo.vo.pwUser;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PwUserMonitorDataVO {
|
||||
|
||||
private String id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String orgName;
|
||||
|
||||
private String operationName;
|
||||
|
||||
private Integer ifSensitiveUser;
|
||||
|
||||
private String userType;
|
||||
|
||||
private Float integrityRate;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user