提交代码

This commit is contained in:
huangzj
2023-07-19 14:58:13 +08:00
parent 285545ecd0
commit 11cd82dc0f
32 changed files with 365 additions and 68 deletions

View File

@@ -28,5 +28,7 @@ public interface RoleEngineerDevFeignClient {
@PostMapping("/getDevice")
public HttpResult<List<String>> getDevice();
@PostMapping("/getRoleproject")
public HttpResult<List<String>> getRoleProject();
}

View File

@@ -42,6 +42,12 @@ public class RoleEngineerDevClientFallbackFactory implements FallbackFactory<Rol
log.error("{}异常,降级处理,异常为:{}","查询角色设备异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<String>> getRoleProject() {
log.error("{}异常,降级处理,异常为:{}","查询角色项目异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

View File

@@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
/**
* Description:
@@ -50,7 +51,9 @@ public class AppProjectAddParm {
private BigDecimal lat;
@ApiModelProperty(value = "拓扑图文件")
@NotNull(message="拓扑图文件不能为空!")
private MultipartFile[] files;
@ApiModelProperty(value="拓扑图模版id集合")
private List<String> topoIds;
}

View File

@@ -42,8 +42,7 @@ public class AppTopologyDiagramAddParm {
@ApiModelProperty(value = "拓扑图文件")
private MultipartFile file;
@ApiModelProperty(value = "拓扑图模板")
private String topoId;

View File

@@ -0,0 +1,58 @@
package com.njcn.csdevice.pojo.param;
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.njcn.db.bo.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/**
*
* Description:
* Date: 2023/5/18 14:01【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class CsLineParm {
private String topoId;
private String projectId;
private String devId;
/**
* 监测点名称
*/
private String name;
/**
* 字典表:安装位置(负载侧,电网侧, 输出侧)
*/
private String position;
/**
* 电压等级
*/
private String volGrade;
/**
* PT变比
*/
private BigDecimal ptRatio;
/**
* CT变比
*/
private BigDecimal ctRatio;
private Double lat;
private Double lng;
}

View File

@@ -33,6 +33,11 @@ public class AppTopologyDiagramPO extends BaseEntity {
*/
@TableField(value = "name")
private String name;
/**
* 拓扑图模板Id
*/
@TableField(value = "topo_id")
private String topoId;
/**

View File

@@ -1,9 +1,12 @@
package com.njcn.csdevice.pojo.vo;
import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
*
* Description:
@@ -29,6 +32,9 @@ public class AppTopologyDiagramVO extends BaseEntity {
@ApiModelProperty(value = "拓扑图名称")
private String name;
@ApiModelProperty(value = "拓扑图模板名称")
private String topoId;
/**
@@ -52,5 +58,9 @@ public class AppTopologyDiagramVO extends BaseEntity {
@ApiModelProperty(value = "status")
private String status;
private List<CsLineTopologyTemplateVO> csLineTopologyTemplateVOList;
private List<AppLineTopologyDiagramPO> appsLineTopologyDiagramPO;
}

View File

@@ -1,8 +1,12 @@
package com.njcn.csdevice.pojo.vo;
import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Description:
* Date: 2023/7/5 15:09【需求编号】
@@ -13,16 +17,22 @@ import lombok.Data;
@Data
public class DevCountVO {
@ApiModelProperty(value = "设备总数")
@ApiModelProperty(value = "工程id")
private String id;
@ApiModelProperty(value = "设备总数")
private Integer allDevCount;
private List<CsEquipmentDeliveryPO> allDevs;
@ApiModelProperty(value = "在线设备数")
private Integer onLineCount;
private List<CsEquipmentDeliveryPO> onLineDevs;
@ApiModelProperty(value = "离线设备数")
private Integer offLineCount;
private List<CsEquipmentDeliveryPO> offLineDevs;
@ApiModelProperty(value = "报警设备数")
private Integer alarmLineCount;
private List<CsEquipmentAlarmVO> alarmLineDevs;
@ApiModelProperty(value = "设备报警事件数")
private Integer alarmEventCount;
@ApiModelProperty(value = "稳态/暂态发生事件数")