refactor(device): 重构设备交付服务并更新Nacos配置
- 在多个模块的bootstrap.yml中添加Nacos用户名密码配置 - 注释掉日志配置中的用户名密码参数避免安全风险 - 重构CsEquipmentDeliveryServiceImpl中的updateEquipmentDelivery方法 - 添加NDID变更处理逻辑,包括设备注册表更新和Redis缓存迁移 - 实现设备名称重复校验功能 - 添加工程项目的变更处理和台账树更新 - 移除CsEventPO中的rms和uchg字段及JsonFormat注解 - 将getYzd方法从CsEventPOServiceImpl迁移到PortableOfflLogServiceImpl - 添加事件严重度和落点计算功能 - 更新补召查询逻辑,使用SortBy参数区分不同类型 - 添加CsLedgerService的queryByPid接口实现
This commit is contained in:
@@ -1,19 +1,25 @@
|
||||
package com.njcn.csharmonic.offline.log.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class NewTaglogbuffer implements Serializable {
|
||||
private NewHeadTaglogbuffer newHeadTaglogbuffer;
|
||||
private List<NewBodyTaglogbuffer> newBodyTaglogbuffers;
|
||||
private LocalDateTime start, end; //事件起始和结束时间
|
||||
private String path = ""; //事件对应波形文件名称
|
||||
//事件起始事件
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
|
||||
private LocalDateTime start;
|
||||
//事件结束时间
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
|
||||
private LocalDateTime end;
|
||||
//事件对应波形文件名称
|
||||
private String path = "";
|
||||
|
||||
public NewTaglogbuffer(NewHeadTaglogbuffer head, ArrayList<NewBodyTaglogbuffer> body) {
|
||||
newHeadTaglogbuffer = head;
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -44,7 +43,7 @@ public class CsEventPO extends BaseEntity {
|
||||
/**
|
||||
* 事件时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@TableField(value = "start_time")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@@ -154,18 +153,6 @@ public class CsEventPO extends BaseEntity {
|
||||
@TableField(value = "sag_source")
|
||||
private String sagSource;
|
||||
|
||||
/**
|
||||
* 瞬态-有效值
|
||||
*/
|
||||
@TableField(value = "rms")
|
||||
private Double rms;
|
||||
|
||||
/**
|
||||
* 瞬态-电压变化
|
||||
*/
|
||||
@TableField(value = "uchg")
|
||||
private Double uchg;
|
||||
|
||||
/**
|
||||
* 暂降严重度
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user