feat(govern): 添加治理方案功能并重构相关数据模型

- 引入PqGovernPlan实体类及对应的数据库映射
- 实现治理方案的增删改查API接口和服务逻辑
- 集成治理方案与监测点、敏感用户的关联关系
- 更新设备交付数据传输对象和持久化对象结构
- 修改台账服务以支持治理方案数据展示
- 优化治理报告生成功能,基于治理方案进行数据查询
- 移除过时的设备治理类型字段,统一使用治理方案管理
This commit is contained in:
xy
2026-06-16 16:26:43 +08:00
parent d44b4f3576
commit 9438f75c01
23 changed files with 873 additions and 219 deletions

View File

@@ -1,14 +1,8 @@
package com.njcn.csdevice.pojo.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
*
* Description:
@@ -76,8 +70,6 @@ public class CsEquipmentDeliveryDTO {
*/
private String debugPerson;
/**
* 合同号
*/
@@ -121,18 +113,4 @@ public class CsEquipmentDeliveryDTO {
*/
private String softinfoId;
/**
* 治理方法
*/
private String governMethod;
/**
* 敏感用户id
*/
private String monitorUser;
/**
* 治理类型(稳态:harmonic 暂态:event)
*/
private String governType;
}

View File

@@ -52,8 +52,8 @@ public class DevDetailDTO {
@ApiModelProperty(value = "监测对象")
private String objType;
@ApiModelProperty(value = "设备治理方案")
private String governType;
// @ApiModelProperty(value = "设备治理方案")
// private String governType;
@ApiModelProperty(value = "监测点id集合")
private List<String> lineList;

View File

@@ -158,22 +158,4 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
* 是否支持升级(0:否 1:是)
*/
private Integer upgrade;
/**
* 治理方法
*/
@TableField(value = "govern_method")
private String governMethod;
/**
* 敏感用户id
*/
@TableField(value = "monitor_user")
private String monitorUser;
/**
* 治理类型(稳态:harmonic 暂态:event)
*/
@TableField(value = "govern_type")
private String governType;
}

View File

@@ -75,6 +75,15 @@ public class CsLedgerVO implements Serializable {
@ApiModelProperty(name = "devConType",value = "设备连接方式 MQTT || CLD")
private String devConType;
@ApiModelProperty(name = "监测点关联用户id")
private String sensitiveUserId;
@ApiModelProperty(name = "监测点关联用户名称")
private String sensitiveUserName;
@ApiModelProperty(name = "治理方案名称")
private String governPlanName;
@ApiModelProperty(name = "children",value = "子节点")
private List<CsLedgerVO> children = new ArrayList<>();