Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app功能合并

Browse Source
This commit is contained in:
xy
2026-03-25 13:33:47 +08:00
parent fc7694a1db
commit 720afd42df
127 changed files with 5356 additions and 1346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsDeviceUserFeignClient.java
View File

@@ -5,6 +5,8 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.fallback.CsDeviceUserClientFallbackFactory;
import com.njcn.csdevice.pojo.param.UserDevParam;
import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
import com.njcn.csdevice.pojo.vo.DevUserVO;
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;
@@ -29,4 +31,11 @@ public interface CsDeviceUserFeignClient {
@PostMapping("/channelDevByUserId")
HttpResult<List<String>> channelDevByUserId(@RequestBody UserDevParam param);
@PostMapping("/queryUserById")
HttpResult<DevUserVO> queryUserById(@RequestParam("devId") String devId);
@PostMapping("/getList")
@ApiOperation("根据设备集合获取数据")
HttpResult<List<CsDeviceUserPO>> getList(@RequestBody UserDevParam param);
}

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLedgerFeignClient.java
View File

@@ -35,6 +35,10 @@ public interface CsLedgerFeignClient {
@PostMapping("/queryDevDetail")
HttpResult<DevDetailDTO> queryDevDetail(@RequestParam("devId") String devId);
@PostMapping("/lineTree")
@ApiOperation("五层设备树(监测点层,根节点为治理设备和便携式设备)")
HttpResult<List<CsLedgerVO>> lineTree();
@PostMapping("/deviceTree")
@ApiOperation("三层设备树(装置层)")
HttpResult<List<CsLedgerVO>> getDeviceTree();

8
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java
View File

@@ -1,8 +1,13 @@
package com.njcn.csdevice.api;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory;
import com.njcn.csdevice.pojo.dto.CsLineDTO;
import com.njcn.csdevice.pojo.param.CsLineParam;
import com.njcn.csdevice.pojo.po.CsLinePO;
import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -64,6 +69,9 @@ public interface CsLineFeignClient {
@PostMapping("/getAllLine")
HttpResult<List<String>> getAllLine();
@PostMapping("/getAllLineDetail")
HttpResult<List<CsLineDTO>> getAllLineDetail();
@PostMapping("/getOverLimitDataByIds")
HttpResult<List<Overlimit>> getOverLimitData(@RequestBody List<String> ids);

22
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsUserPinsFeignClient.java Normal file
View File

@@ -0,0 +1,22 @@
package com.njcn.csdevice.api;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.fallback.ProcessFeignClientFallbackFactory;
import com.njcn.csdevice.pojo.po.CsUserPins;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
/**
* @author xy
*/
@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/csUserPins", fallbackFactory = ProcessFeignClientFallbackFactory.class,contextId = "csUserPins")
public interface CsUserPinsFeignClient {
@PostMapping("/getPinToTopList")
HttpResult<List<CsUserPins>> getPinToTopList();
}

23
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EngineeringFeignClient.java Normal file
View File

@@ -0,0 +1,23 @@
package com.njcn.csdevice.api;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.fallback.AppProjectClientFallbackFactory;
import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
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 java.util.List;
/**
* @author xy
*/
@FeignClient(value = ServerInfo.CS_DEVICE_BOOT, path = "/engineering", fallbackFactory = AppProjectClientFallbackFactory.class,contextId = "engineering")
public interface EngineeringFeignClient {
@PostMapping("/queryEngineering")
HttpResult<List<CsEngineeringVO>> queryEngineering(@Validated @RequestBody CsEngineeringQueryParm csEngineeringQueryParm);
}

13
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsDeviceUserClientFallbackFactory.java
View File

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.CsDeviceUserFeignClient;
import com.njcn.csdevice.pojo.param.UserDevParam;
import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
import com.njcn.csdevice.pojo.vo.DevUserVO;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -51,6 +52,18 @@ public class CsDeviceUserClientFallbackFactory implements FallbackFactory<CsDevi
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<DevUserVO> queryUserById(String devId) {
log.error("{}异常，降级处理，异常为：{}","获取设备主/子用户数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsDeviceUserPO>> getList(UserDevParam param) {
log.error("{}异常，降级处理，异常为：{}","根据设备集合获取数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLedgerFeignClientFallbackFactory.java
View File

@@ -57,6 +57,12 @@ public class CsLedgerFeignClientFallbackFactory implements FallbackFactory<CsLed
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsLedgerVO>> lineTree() {
log.error("{}异常，降级处理，异常为：{}","查询监测点数数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsLedgerVO>> getDeviceTree() {
log.error("{}异常，降级处理，异常为：{}","查询设备树",cause.toString());

7
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java
View File

@@ -4,6 +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.csdevice.api.CsLineFeignClient;
import com.njcn.csdevice.pojo.dto.CsLineDTO;
import com.njcn.csdevice.pojo.param.CsLineParam;
import com.njcn.csdevice.pojo.po.CsLinePO;
import com.njcn.csdevice.pojo.vo.LineDetailDataVO;
@@ -103,6 +104,12 @@ public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignC
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsLineDTO>> getAllLineDetail() {
log.error("{}异常，降级处理，异常为：{}","获取系统中所有监测点id详情异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<Overlimit>> getOverLimitData(List<String> ids) {
log.error("{}异常，降级处理，异常为：{}","根据监测点id集合获取国标限值异常",cause.toString());

43
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsUserPinsFeignClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,43 @@
package com.njcn.csdevice.api.fallback;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.CsUserPinsFeignClient;
import com.njcn.csdevice.pojo.po.CsUserPins;
import com.njcn.csdevice.utils.CsDeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/4/10 20:09
*/
@Slf4j
@Component
public class CsUserPinsFeignClientFallbackFactory implements FallbackFactory<CsUserPinsFeignClient> {
@Override
public CsUserPinsFeignClient create(Throwable cause) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (cause.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = CsDeviceEnumUtil.getExceptionEnum(businessException.getResult());
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new CsUserPinsFeignClient() {
@Override
public HttpResult<List<CsUserPins>> getPinToTopList() {
log.error("{}异常，降级处理，异常为：{}","获取用户置顶设备(工程)数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

38
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EngineeringClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,38 @@
package com.njcn.csdevice.api.fallback;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.csdevice.api.EngineeringFeignClient;
import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm;
import com.njcn.csdevice.pojo.vo.CsEngineeringVO;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author xy
*/
@Slf4j
@Component
public class EngineeringClientFallbackFactory implements FallbackFactory<EngineeringFeignClient> {
@Override
public EngineeringFeignClient create(Throwable cause) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (cause.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException) cause.getCause();
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new EngineeringFeignClient() {
@Override
public HttpResult<List<CsEngineeringVO>> queryEngineering(CsEngineeringQueryParm csEngineeringQueryParm) {
log.error("{}异常，降级处理，异常为：{}","查询工程列表接口异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

28
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/param/CsUserPinsParam.java Normal file
View File

@@ -0,0 +1,28 @@
package com.njcn.csdevice.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* @author xy
*/
@Data
public class CsUserPinsParam implements Serializable {
@ApiModelProperty("用户id")
@NotBlank(message = "用户id")
private String userId;
@ApiModelProperty("目标类型：1-设备，2-工程")
@NotNull(message = "目标类型：1-设备，2-工程")
private Integer targetType;
@ApiModelProperty("目标ID（设备ID或工程ID）")
@NotBlank(message = "目标ID（设备ID或工程ID）")
private String targetId;
}

148
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsLineDTO.java Normal file
View File

@@ -0,0 +1,148 @@
package com.njcn.csdevice.pojo.dto;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
@NoArgsConstructor
public class CsLineDTO implements Serializable {
/**
* 监测点id
*/
private String lineId;
/**
* 装置id
*/
private String deviceId;
/**
* 装置id
*/
private String deviceType;
/**
* 监测点名称
*/
private String name;
/**
* 字典表：安装位置（负载侧,电网侧, 输出侧）
*/
private String position;
/**
* 数据集id
*/
private String dataSetId;
/**
* 模板id
*/
private String dataModelId;
/**
* 电压等级
*/
private Double volGrade;
/**
* PT变比
*/
private Double ptRatio;
/**
* PT2次变比
*/
private Double pt2Ratio;
/**
* CT变比
*/
private Double ctRatio;
/**
* CT2变比
*/
private Double ct2Ratio;
/**
* 状态(0：删除 1：正常)
*/
private Integer status;
/**
* 接线方式(0-星型 1-角型 2-V型)
*/
private Integer conType;
/**
* 逻辑子设备id(与模板对应)
*/
private Integer clDid;
/**
* 监测点统计间隔
*/
private Integer lineInterval;
/**
* 运行状态
*/
private Integer runStatus;
/**
* 监测点线路号
*/
private Integer lineNo;
/**
* 监测对象类型
*/
private String monitorObj;
/**
* 是否治理(0:未治理 1:已治理)
*/
private Integer govern;
private String monitorUser;
/**
* 短路容量
*/
private Double shortCircuitCapacity;
/**
* 设备容量
*/
private Double devCapacity;
/**
* 基准容量
*/
private Double basicCapacity;
/**
* 协议容量
*/
private Double protocolCapacity;
/**
* 治理报告文件路径
*/
private String reportFilePath;
/**
* 日志等级(NORMAL、DEBUG、WARN、ERROR)
*/
private String lineLogLevel;
/**
* 是否是主要监测点(0: 不是 1:是)
*/
private Integer isImportant;
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DevDetailDTO.java
View File

@@ -31,4 +31,10 @@ public class DevDetailDTO {
@ApiModelProperty(value = "设备名称")
private String equipmentName;
@ApiModelProperty(value = "设备通讯状态")
private Integer runStatus;
@ApiModelProperty(value = "设备MAC地址")
private String devMac;
}

27
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/LineParamDTO.java
View File

@@ -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/8/1 15:25【需求编号】
@@ -26,4 +28,29 @@ public class LineParamDTO {
@ApiModelProperty(value = "监测点id")
private String lineId;
@ApiModelProperty(value = "时间类型 0:日报 1:月报")
private Integer timeType;
@ApiModelProperty(value = "时间")
private String time;
@ApiModelProperty(value = "起始时间")
private String startTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
@ApiModelProperty(value = "集合")
private List<String> list;
@Data
public static class DevParamDTO {
@ApiModelProperty(value = "时间")
private String time;
@ApiModelProperty(value = "设备id集合")
private List<String> devList;
}
}

44
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsUserPins.java Normal file
View File

@@ -0,0 +1,44 @@
package com.njcn.csdevice.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
/**
* <p>
* 用户置顶表
* </p>
*
* @author xy
* @since 2026-03-04
*/
@Getter
@Setter
@TableName("cs_user_pins")
public class CsUserPins extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
private String id;
/**
* 用户ID
*/
private String userId;
/**
* 目标类型：1-设备，2-工程
*/
private Integer targetType;
/**
* 目标ID（设备ID或工程ID）
*/
private String targetId;
}

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEngineeringVO.java
View File

@@ -67,5 +67,6 @@ public class CsEngineeringVO extends BaseEntity {
@ApiModelProperty(value = "状态")
private String status;
@ApiModelProperty(value = "排序")
private Integer sort;
}

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java
View File

@@ -69,6 +69,9 @@ public class CsLedgerVO implements Serializable {
@ApiModelProperty(name = "process",value = "流程状态")
private Integer process;
@ApiModelProperty(name = "isTop",value = "是否置顶,默认不置顶")
private Integer isTop = 0;
@ApiModelProperty(name = "children",value = "子节点")
private List<CsLedgerVO> children = new ArrayList<>();

41
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EngineeringHomePageVO.java Normal file
View File

@@ -0,0 +1,41 @@
package com.njcn.csdevice.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2026/3/5
*/
@Data
public class EngineeringHomePageVO implements Serializable {
@ApiModelProperty(name = "engineeringId",value = "工程id")
private String engineeringId;
@ApiModelProperty(name = "engineeringName",value = "工程名称")
private String engineeringName;
@ApiModelProperty(name = "devTotal",value = "设备总数")
private Integer devTotal;
@ApiModelProperty(name = "onlineDevTotal",value = "在线设备数")
private Integer onlineDevTotal;
@ApiModelProperty(name = "offlineDevTotal",value = "离线设备数")
private Integer offlineDevTotal;
@ApiModelProperty(name = "alarmTotal",value = "告警数量(未读)")
private Integer alarmTotal;
@ApiModelProperty(name = "isTop",value = "是否置顶 0:未置顶 1:已置顶")
private Integer isTop = 0;
@ApiModelProperty(name = "sort",value = "排序")
private Integer sort;
}

15
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
View File

@@ -1,8 +1,11 @@
package com.njcn.csdevice.pojo.vo;
import com.njcn.csdevice.pojo.po.CsLinePO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
*
* Description:
@@ -54,4 +57,16 @@ public class ProjectEquipmentVO {
@ApiModelProperty(value = "设备nDid")
private String nDid;
@ApiModelProperty(value = "排序")
private Integer sort;
@ApiModelProperty(value = "是否置顶(0:未置顶 1:置顶),默认是0")
private Integer isTop = 0;
@ApiModelProperty(value = "设备类型(监测设备:DEV_CLD 治理设备:Direct_Connected_Device)")
private String devType;
@ApiModelProperty(value = "监测点集合")
private List<CsLinePO> lineList;
}