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

功能优化

Browse Source
This commit is contained in:
xy
2026-02-06 09:55:14 +08:00
parent 3727b5777e
commit bd1fb82532
33 changed files with 359 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,7 @@
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.param.CsLineParam;
import com.njcn.csdevice.pojo.po.CsLinePO;

5
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/IntegrityFeignClient.java
View File

@@ -3,11 +3,12 @@ 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.IntegrityClientFallbackFactory;
import com.njcn.csdevice.param.IcdBzParam;
import com.njcn.csdevice.pojo.po.RStatIntegrityD;
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.RequestParam;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -18,6 +19,6 @@ import java.util.List;
public interface IntegrityFeignClient {
@PostMapping("/list")
HttpResult<List<RStatIntegrityD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime);
HttpResult<List<RStatIntegrityD>> list(@RequestBody @Validated IcdBzParam param);
}

5
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/OnlineRateFeignClient.java
View File

@@ -3,11 +3,12 @@ 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.onlineRateClientFallbackFactory;
import com.njcn.csdevice.param.IcdBzParam;
import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
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.RequestParam;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -18,6 +19,6 @@ import java.util.List;
public interface OnlineRateFeignClient {
@PostMapping("/list")
HttpResult<List<RStatOnlineRateD>> list(@Validated @RequestParam("list") List<String> list, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime);
HttpResult<List<RStatOnlineRateD>> list(@RequestBody @Validated IcdBzParam param);
}

4
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/IntegrityClientFallbackFactory.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.IntegrityFeignClient;
import com.njcn.csdevice.param.IcdBzParam;
import com.njcn.csdevice.pojo.po.RStatIntegrityD;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -26,9 +27,8 @@ public class IntegrityClientFallbackFactory implements FallbackFactory<Integrity
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new IntegrityFeignClient() {
@Override
public HttpResult<List<RStatIntegrityD>> list(List<String> list, String startTime, String endTime) {
public HttpResult<List<RStatIntegrityD>> list(IcdBzParam param) {
log.error("{}异常，降级处理，异常为：{}","查询数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/onlineRateClientFallbackFactory.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.OnlineRateFeignClient;
import com.njcn.csdevice.param.IcdBzParam;
import com.njcn.csdevice.pojo.po.RStatOnlineRateD;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -28,7 +29,7 @@ public class onlineRateClientFallbackFactory implements FallbackFactory<OnlineRa
return new OnlineRateFeignClient() {
@Override
public HttpResult<List<RStatOnlineRateD>> list(List<String> list, String startTime, String endTime) {
public HttpResult<List<RStatOnlineRateD>> list(IcdBzParam param) {
log.error("{}异常，降级处理，异常为：{}","查询数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}

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

@@ -97,4 +97,7 @@ public class CsEquipmentDeliveryAddParm implements Serializable {
@ApiModelProperty(value="项目id")
private String projectId;
@ApiModelProperty(value="日志等级(NORMAL、DEBUG、WARN、ERROR)")
private String devLogLevel;
}

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

@@ -101,4 +101,7 @@ public class CsEquipmentDeliveryAuditParm {
@ApiModelProperty(value="前置机进程号")
private Integer nodeProcess;
@ApiModelProperty(value="日志等级(NORMAL、DEBUG、WARN、ERROR)")
private String devLogLevel;
}

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java
View File

@@ -56,6 +56,8 @@ public class CsLedgerParam extends BaseEntity {
@NotBlank(message = "台账表Id不能为空")
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
private String id;
private String pids;
}

8
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java
View File

@@ -145,6 +145,14 @@ public class CsLineParam extends BaseEntity {
*/
private String position;
/**
* 日志等级(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/po/CsEquipmentDeliveryPO.java
View File

@@ -130,4 +130,10 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
@TableField(value = "node_process")
private Integer nodeProcess;
/**
* 日志等级(NORMAL、DEBUG、WARN、ERROR)
*/
@TableField(value = "dev_log_level")
private String devLogLevel;
}

12
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java
View File

@@ -165,4 +165,16 @@ public class CsLinePO extends BaseEntity {
*/
@TableField(value = "report_file_path")
private String reportFilePath;
/**
* 日志等级(NORMAL、DEBUG、WARN、ERROR)
*/
@TableField(value = "line_log_level")
private String lineLogLevel;
/**
* 是否是主要监测点(0: 不是 1:是)
*/
@TableField(value = "is_important")
private Integer isImportant;
}

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

@@ -6,7 +6,9 @@ import lombok.Data;
import java.io.Serializable;
import java.util.List;
//台账信息
/**
* @author xy
*/ //台账信息
@Data
public class DeviceInfo implements Serializable {
@@ -31,6 +33,9 @@ public class DeviceInfo implements Serializable {
@ApiModelProperty("对时启动标志")
private boolean rightTime;
@ApiModelProperty("终端日志等级")
private String devLogLevel;
@ApiModelProperty("监测点集合")
private List<MonitorInfo> monitorData;
@@ -70,6 +75,9 @@ public class DeviceInfo implements Serializable {
@ApiModelProperty("ct2")
private Double ct2;
@ApiModelProperty("监测点日志等级")
private String lineLogLevel;
}
}

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

@@ -20,8 +20,14 @@ public class EngineeringProjectRelationVo implements Serializable {
@ApiModelProperty("工程名称")
private String engineeringName;
@ApiModelProperty("区域")
private String engineeringArea;
@ApiModelProperty("省ID")
private String provinceId;
@ApiModelProperty("市ID")
private String cityId;
@ApiModelProperty("区域名称")
private String engineeringAreaName;
@ApiModelProperty("工程备注")
private String engineeringRemark;
@@ -51,6 +57,9 @@ public class EngineeringProjectRelationVo implements Serializable {
@ApiModelProperty("项目排序")
private Integer projectSort;
@ApiModelProperty("拓扑图id")
private String topologyInfoId;
@ApiModelProperty("拓扑图信息")
private String topologyInfo;

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

@@ -132,4 +132,7 @@ public class LineDetailDataVO {
@ApiModelProperty(name = "对象类型大类")
private String bigObjType;
@ApiModelProperty(name = "监测点数据类型 一次值:Primary 二次值:Secondary")
private String dataLevel;
}