diff --git a/cs-event/cs-event-api/pom.xml b/cs-event/cs-event-api/pom.xml deleted file mode 100644 index 4b160c7..0000000 --- a/cs-event/cs-event-api/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - cs-event - com.njcn - 1.0.0 - - 4.0.0 - - cs-event-api - 1.0.0 - - cs-event-api - - - UTF-8 - 8 - 8 - - - diff --git a/cs-event/cs-event-boot/pom.xml b/cs-event/cs-event-boot/pom.xml deleted file mode 100644 index 57572c7..0000000 --- a/cs-event/cs-event-boot/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - cs-event - com.njcn - 1.0.0 - - 4.0.0 - - cs-event-boot - 1.0.0 - - cs-event-boot - - - UTF-8 - 8 - 8 - - - - - com.njcn - common-web - ${project.version} - - - com.njcn - common-swagger - ${project.version} - - - org.mybatis - mybatis-spring - 2.0.5 - - - com.njcn - common-db - ${project.version} - - - - - csEventBoot - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - -Xlint:unchecked - - - - org.springframework.boot - spring-boot-maven-plugin - - - package - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.0.0 - - - - build-image - ${docker.operate} - - build - - - - - - http://${docker.repostory} - - ${docker.repostory}/${docker.registry.name}/${project.artifactId} - - - latest - - - ${docker.url} - ${basedir}/ - - - - /ROOT - - ${project.build.directory} - - ${project.build.finalName}.jar - - - - - - - diff --git a/cs-event/cs-event-boot/src/main/java/com/njcn/csevent/CsEventBootApplication.java b/cs-event/cs-event-boot/src/main/java/com/njcn/csevent/CsEventBootApplication.java deleted file mode 100644 index ba4a3af..0000000 --- a/cs-event/cs-event-boot/src/main/java/com/njcn/csevent/CsEventBootApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njcn.csevent; - -import lombok.extern.slf4j.Slf4j; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; - - -/** - * @author hongawen - * @version 1.0.0 - * @date 2021年12月09日 20:59 - */ -@Slf4j -@MapperScan("com.njcn.**.mapper") -@EnableFeignClients(basePackages = "com.njcn") -@SpringBootApplication(scanBasePackages = "com.njcn") -public class CsEventBootApplication { - - public static void main(String[] args) { - SpringApplication.run(CsEventBootApplication.class, args); - } - -} diff --git a/cs-event/cs-event-boot/src/main/resources/bootstrap.yml b/cs-event/cs-event-boot/src/main/resources/bootstrap.yml deleted file mode 100644 index 3aca7df..0000000 --- a/cs-event/cs-event-boot/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,51 +0,0 @@ -#当前服务的基本信息 -microservice: - ename: @artifactId@ - name: '@name@' - version: @version@ - sentinel: - url: @sentinel.url@ - gateway: - url: @gateway.url@ -server: - port: 10221 -#feign接口开启服务熔断降级处理 -feign: - sentinel: - enabled: true -spring: - application: - name: @artifactId@ - cloud: - nacos: - discovery: - ip: @service.server.url@ - server-addr: @nacos.url@ - namespace: @nacos.namespace@ - config: - server-addr: @nacos.url@ - namespace: @nacos.namespace@ - file-extension: yaml - shared-configs: - - data-id: share-config.yaml - refresh: true - - data-Id: algorithm-config.yaml - refresh: true - main: - allow-bean-definition-overriding: true - - -#项目日志的配置 -logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml - level: - root: info - - -#mybatis配置信息 -mybatis-plus: - #别名扫描 - type-aliases-package: com.njcn.event.pojo - -mqtt: - client-id: @artifactId@${random.value} \ No newline at end of file diff --git a/cs-event/cs-event-boot/src/test/java/com/njcn/AppTest.java b/cs-event/cs-event-boot/src/test/java/com/njcn/AppTest.java deleted file mode 100644 index 17c8f16..0000000 --- a/cs-event/cs-event-boot/src/test/java/com/njcn/AppTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn; - -import org.junit.Test; - -import static org.junit.Assert.assertTrue; - -/** - * Unit test for simple App. - */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); - } -} diff --git a/cs-event/pom.xml b/cs-event/pom.xml deleted file mode 100644 index 057f55b..0000000 --- a/cs-event/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - govern - com.njcn - 1.0.0 - - 4.0.0 - - cs-event - pom - 1.0.0 - - cs-event-api - cs-event-boot - - - cs-event - 治理暂态模块 - - - UTF-8 - 8 - 8 - - diff --git a/cs-warn/cs-warn-api/pom.xml b/cs-warn/cs-warn-api/pom.xml deleted file mode 100644 index 28fd2e6..0000000 --- a/cs-warn/cs-warn-api/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - cs-warn - com.njcn - 1.0.0 - - 4.0.0 - - cs-warn-api - 1.0.0 - - cs-warn-api - - - - com.njcn - common-core - ${project.version} - - - com.njcn - common-db - ${project.version} - - - - org.projectlombok - lombok - - - com.njcn - common-microservice - ${project.version} - - - - UTF-8 - 8 - 8 - - diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/CsEquipmentAlarmFeignClient.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/CsEquipmentAlarmFeignClient.java deleted file mode 100644 index aaf6422..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/CsEquipmentAlarmFeignClient.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.njcn.cswarn.api; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.cswarn.api.fallback.CsEquipmentAlarmClientFallbackFactory; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -/** - * @author xy - */ -@FeignClient(value = ServerInfo.CS_WARN_BOOT, path = "/EquipmentAlarm", fallbackFactory = CsEquipmentAlarmClientFallbackFactory.class,contextId = "equipmentalarm") -public interface CsEquipmentAlarmFeignClient { - - - @PostMapping("/queryList") - HttpResult> queryList(@RequestBody CsEquipmentAlarmParm csEquipmentAlarmParm); -} diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/fallback/CsEquipmentAlarmClientFallbackFactory.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/fallback/CsEquipmentAlarmClientFallbackFactory.java deleted file mode 100644 index 9019ea9..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/fallback/CsEquipmentAlarmClientFallbackFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.njcn.cswarn.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.cswarn.api.CsEquipmentAlarmFeignClient; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author xy - */ -@Slf4j -@Component -public class CsEquipmentAlarmClientFallbackFactory implements FallbackFactory { - @Override - public CsEquipmentAlarmFeignClient create(Throwable cause) { - //判断抛出异常是否为解码器抛出的业务异常 - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (cause.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException) cause.getCause(); - } - Enum finalExceptionEnum = exceptionEnum; - return new CsEquipmentAlarmFeignClient() { - - @Override - public HttpResult> queryList(CsEquipmentAlarmParm csEquipmentAlarmParm) { - log.error("{}异常，降级处理，异常为：{}","查询设备警告接口异常",cause.toString()); - throw new BusinessException(finalExceptionEnum); - } - - - }; - } -} diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmAddParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmAddParm.java deleted file mode 100644 index 1e02534..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmAddParm.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.njcn.cswarn.pojo.parm; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsEquipmentAlarmAddParm { - - - /** - * 项目Id - */ - @ApiModelProperty(value = "项目Id") - @NotBlank(message="项目Id不能为空！") - private String projectId; - - /** - * 设备id - */ - @ApiModelProperty(value = "设备id") - @NotBlank(message="设备id不能为空！") - private String equipmentId; - - /** - * 告警信息 - */ - @ApiModelProperty(value = "告警信息") - private String alarmMsg; - - /** - * 告警级别(字典表) - */ - @ApiModelProperty(value = "告警级别") - @NotBlank(message="告警级别不能为空！") - private String alarmLevel; - - /** - * 开始时间 - */ - @ApiModelProperty(value = "开始时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @NotNull(message="开始时间不能为空！") - private LocalDateTime startTime; - - /** - * 结束时间 - */ - @ApiModelProperty(value = "结束时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @NotNull(message="结束时间不能为空！") - private LocalDateTime endTime; - - -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmParm.java deleted file mode 100644 index 9dfdaac..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmParm.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.njcn.cswarn.pojo.parm; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsEquipmentAlarmParm { - - - - @ApiModelProperty(value = "工程id") - private String engineerId; - /** - * 项目Id - */ - @ApiModelProperty(value = "项目Id") - private String projectId; - - /** - * 设备id - */ - @ApiModelProperty(value = "设备id") - private String equipmentId; - - - /** - * 告警级别(字典表) - */ - @ApiModelProperty(value = "告警级别") - private String alarmLevel; - - @ApiModelProperty(value = "处理状态") - private String dealFlag; - - /** - * 开始时间 - */ - @ApiModelProperty(value = "开始时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime startTime; - - /** - * 结束时间 - */ - @ApiModelProperty(value = "结束时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime endTime; - - @Data - @EqualsAndHashCode(callSuper = true) - public static class CsEquipmentAlarmPageParm extends CsEquipmentAlarmParm { - @NotNull(message="当前页不能为空！") - @Min(value = 1, message = "当前页不能为0") - @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true) - private Integer pageNum; - /**显示条数*/ - @NotNull(message="显示条数不能为空！") - @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) - private Integer pageSize; - } - - -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailParm.java deleted file mode 100644 index a282b9e..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailParm.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.njcn.cswarn.pojo.parm; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsEventDetailParm { - - - @ApiModelProperty(value = "工程id") - private String engineerId; - - /** - * 项目Id - */ - @ApiModelProperty(value = "项目Id") - private String projectId; - - @ApiModelProperty(value = "设备id") - private String devId; - - @ApiModelProperty(value = "监测点id") - private String lineId; - - - /** - * 开始时间 - */ - @ApiModelProperty(value = "开始时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime startTime; - - /** - * 结束时间 - */ - @ApiModelProperty(value = "结束时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime endTime; - - @Data - @EqualsAndHashCode(callSuper = true) - public static class CsEventDetailPageParm extends CsEventDetailParm { - @NotNull(message="当前页不能为空！") - @Min(value = 1, message = "当前页不能为0") - @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true) - private Integer pageNum; - /**显示条数*/ - @NotNull(message="显示条数不能为空！") - @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) - private Integer pageSize; - } - -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java deleted file mode 100644 index 273ecd7..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsStatLimitRatePageParm.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.njcn.cswarn.pojo.parm; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsStatLimitRatePageParm { - @NotNull(message="当前页不能为空！") - @Min(value = 1, message = "当前页不能为0") - @ApiModelProperty(value = "当前页",name = "pageNum",dataType ="Integer",required = true) - private Integer pageNum; - /**显示条数*/ - @NotNull(message="显示条数不能为空！") - @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) - private Integer pageSize; - - - @ApiModelProperty(value = "工程id") - private String engineerId; - - /** - * 项目Id - */ - @ApiModelProperty(value = "项目Id") - private String projectId; - - @ApiModelProperty(value = "设备id") - private String devId; - - @ApiModelProperty(value = "监测点id") - private String lineId; - /** - * 开始时间 - */ - @ApiModelProperty(value = "开始时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime startTime; - - /** - * 结束时间 - */ - @ApiModelProperty(value = "结束时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime endTime; - - - -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsEquipmentAlarmPO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsEquipmentAlarmPO.java deleted file mode 100644 index 4002f48..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsEquipmentAlarmPO.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.njcn.cswarn.pojo.po; - -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 io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -@TableName(value = "cs_equipment_alarm") -public class CsEquipmentAlarmPO extends BaseEntity { - /** - * id - */ - @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value = "id") - private String id; - - /** - * 项目Id - */ - @TableField(value = "project_id") - private String projectId; - - /** - * 设备id - */ - @TableField(value = "equipment_id") - private String equipmentId; - - /** - * 告警信息 - */ - @TableField(value = "alarm_msg") - private String alarmMsg; - - /** - * 告警级别(字典表) - */ - @TableField(value = "alarm_level") - private String alarmLevel; - - /** - * 开始时间 - */ - @TableField(value = "start_time") - private LocalDateTime startTime; - - /** - * 结束时间 - */ - @TableField(value = "end_time") - private LocalDateTime endTime; - - /** - * 状态(0：删除 1：正常) - */ - @TableField(value = "`status`") - private String status; - /* - * 处理状态(0：已处理 1：未处理) - * */ - @TableField(value = "deal_flag") - private String dealFlag; - - - public static final String COL_ID = "id"; - - public static final String COL_PROJECT_ID = "project_id"; - - public static final String COL_EQUIPMENT_ID = "equipment_id"; - - public static final String COL_ALARM_MSG = "alarm_msg"; - - public static final String COL_ALARM_LEVEL = "alarm_level"; - - public static final String COL_START_TIME = "start_time"; - - public static final String COL_END_TIME = "end_time"; - - public static final String COL_STATUS = "status"; - - public static final String COL_CREATE_BY = "create_by"; - - public static final String COL_CREATE_TIME = "create_time"; - - public static final String COL_UPDATE_BY = "update_by"; - - public static final String COL_UPDATE_TIME = "update_time"; -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsEventDetailPO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsEventDetailPO.java deleted file mode 100644 index ce03caa..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsEventDetailPO.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.njcn.cswarn.pojo.po; - -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 lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * Description: - * Date: 2023/5/17 10:51【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -@TableName(value = "cs_event_detail") -public class CsEventDetailPO { - /** - * 暂时事件ID - */ - @TableId(value = "event_id", type = IdType.ASSIGN_UUID) - private String eventId; - - /** - * 监测点ID - */ - @TableField(value = "measurement_point_id") - private String measurementPointId; - - /** - * 统计指标类型 - */ - @TableField(value = "event_type") - private String eventType; - - /** - * 暂降原因（字典表PQS_Dicdata） - */ - @TableField(value = "advance_reason") - private String advanceReason; - - /** - * 暂降类型（字典表PQS_Dicdata） - */ - @TableField(value = "advance_type") - private String advanceType; - - /** - * 事件关联分析表Guid - */ - @TableField(value = "eventass_index") - private String eventassIndex; - - @TableField(value = "dq_time") - private Double dqTime; - - /** - * 特征值计算更新时间（外键PQS_Relevance的Time字段） - */ - @TableField(value = "deal_time") - private Date dealTime; - - /** - * 默认事件个数为0 - */ - @TableField(value = "num") - private Integer num; - - /** - * 波形文件是否从装置招到本地(0：未招，1：已招)默认值为0 - */ - @TableField(value = "file_flag") - private Boolean fileFlag; - - /** - * 特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0 - */ - @TableField(value = "deal_flag") - private Boolean dealFlag; - - /** - * 处理结果第一条事件发生时间(读comtra文件获取) - */ - @TableField(value = "first_time") - private Date firstTime; - - /** - * 处理结果第一条事件暂降类型（字典表PQS_Dicdata） - */ - @TableField(value = "first_type") - private String firstType; - - /** - * 处理结果第一条事件发生时间毫秒(读comtra文件获取) - */ - @TableField(value = "first_ms") - private BigDecimal firstMs; - - /** - * 暂降能量 - */ - @TableField(value = "energy") - private Double energy; - - /** - * 暂降严重度 - */ - @TableField(value = "severity") - private Double severity; - - /** - * 暂降源与监测位置关系 Upper:上游；Lower :下游；Unknown :未知;为空则是未计算 - */ - @TableField(value = "sagsource") - private String sagsource; - - /** - * 开始时间 - */ - @TableField(value = "start_time") - private Date startTime; - - /** - * 持续时间，单位秒 - */ - @TableField(value = "duration") - private BigDecimal duration; - - /** - * 特征幅值 - */ - @TableField(value = "feature_amplitude") - private BigDecimal featureAmplitude; - - /** - * 相别 - */ - @TableField(value = "phase") - private String phase; - - /** - * 事件描述 - */ - @TableField(value = "event_describe") - private String eventDescribe; - - /** - * 波形路径 - */ - @TableField(value = "wave_path") - private String wavePath; - - /** - * 暂态事件上送时间 - */ - @TableField(value = "create_time") - private Date createTime; - - @TableField(value = "transient_value") - private Double transientValue; - - public static final String COL_EVENT_ID = "event_id"; - - public static final String COL_MEASUREMENT_POINT_ID = "measurement_point_id"; - - public static final String COL_EVENT_TYPE = "event_type"; - - public static final String COL_ADVANCE_REASON = "advance_reason"; - - public static final String COL_ADVANCE_TYPE = "advance_type"; - - public static final String COL_EVENTASS_INDEX = "eventass_index"; - - public static final String COL_DQ_TIME = "dq_time"; - - public static final String COL_DEAL_TIME = "deal_time"; - - public static final String COL_NUM = "num"; - - public static final String COL_FILE_FLAG = "file_flag"; - - public static final String COL_DEAL_FLAG = "deal_flag"; - - public static final String COL_FIRST_TIME = "first_time"; - - public static final String COL_FIRST_TYPE = "first_type"; - - public static final String COL_FIRST_MS = "first_ms"; - - public static final String COL_ENERGY = "energy"; - - public static final String COL_SEVERITY = "severity"; - - public static final String COL_SAGSOURCE = "sagsource"; - - public static final String COL_START_TIME = "start_time"; - - public static final String COL_DURATION = "duration"; - - public static final String COL_FEATURE_AMPLITUDE = "feature_amplitude"; - - public static final String COL_PHASE = "phase"; - - public static final String COL_EVENT_DESCRIBE = "event_describe"; - - public static final String COL_WAVE_PATH = "wave_path"; - - public static final String COL_CREATE_TIME = "create_time"; - - public static final String COL_TRANSIENT_VALUE = "transient_value"; -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsStatLimitRateDPO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsStatLimitRateDPO.java deleted file mode 100644 index d852573..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/po/CsStatLimitRateDPO.java +++ /dev/null @@ -1,244 +0,0 @@ -package com.njcn.cswarn.pojo.po; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; - -/** - * - * Description: - * Date: 2023/5/17 13:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -@TableName(value = "cs_stat_limit_rate_d") -public class CsStatLimitRateDPO { - @TableField(value = "time_id") - private Date timeId; - - @TableField(value = "my_index") - private String myIndex; - - @TableField(value = "phasic_type") - private String phasicType; - - @TableField(value = "all_time") - private Integer allTime; - - @TableField(value = "flicker_all_time") - private Integer flickerAllTime; - - @TableField(value = "freq_dev_overtime") - private Integer freqDevOvertime; - - @TableField(value = "voltage_dev_overtime") - private Integer voltageDevOvertime; - - @TableField(value = "ubalance_overtime") - private Integer ubalanceOvertime; - - @TableField(value = "flicker_overtime") - private Integer flickerOvertime; - - @TableField(value = "uaberrance_overtime") - private Integer uaberranceOvertime; - - @TableField(value = "uharm_2_overtime") - private Integer uharm2Overtime; - - @TableField(value = "uharm_3_overtime") - private Integer uharm3Overtime; - - @TableField(value = "uharm_4_overtime") - private Integer uharm4Overtime; - - @TableField(value = "uharm_5_overtime") - private Integer uharm5Overtime; - - @TableField(value = "uharm_6_overtime") - private Integer uharm6Overtime; - - @TableField(value = "uharm_7_overtime") - private Integer uharm7Overtime; - - @TableField(value = "uharm_8_overtime") - private Integer uharm8Overtime; - - @TableField(value = "uharm_9_overtime") - private Integer uharm9Overtime; - - @TableField(value = "uharm_10_overtime") - private Integer uharm10Overtime; - - @TableField(value = "uharm_11_overtime") - private Integer uharm11Overtime; - - @TableField(value = "uharm_12_overtime") - private Integer uharm12Overtime; - - @TableField(value = "uharm_13_overtime") - private Integer uharm13Overtime; - - @TableField(value = "uharm_14_overtime") - private Integer uharm14Overtime; - - @TableField(value = "uharm_15_overtime") - private Integer uharm15Overtime; - - @TableField(value = "uharm_16_overtime") - private Integer uharm16Overtime; - - @TableField(value = "uharm_17_overtime") - private Integer uharm17Overtime; - - @TableField(value = "uharm_18_overtime") - private Integer uharm18Overtime; - - @TableField(value = "uharm_19_overtime") - private Integer uharm19Overtime; - - @TableField(value = "uharm_20_overtime") - private Integer uharm20Overtime; - - @TableField(value = "uharm_21_overtime") - private Integer uharm21Overtime; - - @TableField(value = "uharm_22_overtime") - private Integer uharm22Overtime; - - @TableField(value = "uharm_23_overtime") - private Integer uharm23Overtime; - - @TableField(value = "uharm_24_overtime") - private Integer uharm24Overtime; - - @TableField(value = "uharm_25_overtime") - private Integer uharm25Overtime; - - @TableField(value = "iharm_2_overtime") - private Integer iharm2Overtime; - - @TableField(value = "iharm_3_overtime") - private Integer iharm3Overtime; - - @TableField(value = "iharm_4_overtime") - private Integer iharm4Overtime; - - @TableField(value = "iharm_5_overtime") - private Integer iharm5Overtime; - - @TableField(value = "iharm_6_overtime") - private Integer iharm6Overtime; - - @TableField(value = "iharm_7_overtime") - private Integer iharm7Overtime; - - @TableField(value = "iharm_8_overtime") - private Integer iharm8Overtime; - - @TableField(value = "iharm_9_overtime") - private Integer iharm9Overtime; - - @TableField(value = "iharm_10_overtime") - private Integer iharm10Overtime; - - @TableField(value = "iharm_11_overtime") - private Integer iharm11Overtime; - - @TableField(value = "iharm_12_overtime") - private Integer iharm12Overtime; - - @TableField(value = "iharm_13_overtime") - private Integer iharm13Overtime; - - @TableField(value = "iharm_14_overtime") - private Integer iharm14Overtime; - - @TableField(value = "iharm_15_overtime") - private Integer iharm15Overtime; - - @TableField(value = "iharm_16_overtime") - private Integer iharm16Overtime; - - @TableField(value = "iharm_17_overtime") - private Integer iharm17Overtime; - - @TableField(value = "iharm_18_overtime") - private Integer iharm18Overtime; - - @TableField(value = "iharm_19_overtime") - private Integer iharm19Overtime; - - @TableField(value = "iharm_20_overtime") - private Integer iharm20Overtime; - - @TableField(value = "iharm_21_overtime") - private Integer iharm21Overtime; - - @TableField(value = "iharm_22_overtime") - private Integer iharm22Overtime; - - @TableField(value = "iharm_23_overtime") - private Integer iharm23Overtime; - - @TableField(value = "iharm_24_overtime") - private Integer iharm24Overtime; - - @TableField(value = "iharm_25_overtime") - private Integer iharm25Overtime; - - @TableField(value = "inuharm_1_overtime") - private Integer inuharm1Overtime; - - @TableField(value = "inuharm_2_overtime") - private Integer inuharm2Overtime; - - @TableField(value = "inuharm_3_overtime") - private Integer inuharm3Overtime; - - @TableField(value = "inuharm_4_overtime") - private Integer inuharm4Overtime; - - @TableField(value = "inuharm_5_overtime") - private Integer inuharm5Overtime; - - @TableField(value = "inuharm_6_overtime") - private Integer inuharm6Overtime; - - @TableField(value = "inuharm_7_overtime") - private Integer inuharm7Overtime; - - @TableField(value = "inuharm_8_overtime") - private Integer inuharm8Overtime; - - @TableField(value = "inuharm_9_overtime") - private Integer inuharm9Overtime; - - @TableField(value = "inuharm_10_overtime") - private Integer inuharm10Overtime; - - @TableField(value = "inuharm_11_overtime") - private Integer inuharm11Overtime; - - @TableField(value = "inuharm_12_overtime") - private Integer inuharm12Overtime; - - @TableField(value = "inuharm_13_overtime") - private Integer inuharm13Overtime; - - @TableField(value = "inuharm_14_overtime") - private Integer inuharm14Overtime; - - @TableField(value = "inuharm_15_overtime") - private Integer inuharm15Overtime; - - @TableField(value = "inuharm_16_overtime") - private Integer inuharm16Overtime; - - @TableField(value = "i_neg_overtime") - private Integer iNegOvertime; -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmCountVO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmCountVO.java deleted file mode 100644 index 8b51f33..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmCountVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.cswarn.pojo.vo; - -import com.njcn.db.bo.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsEquipmentAlarmCountVO extends BaseEntity { - - - @ApiModelProperty(value = "报警设备数") - private Integer alarmDevCount; - private List devDetail; - @Data - public static class AlarmDevice{ - private String devId; - private String devName; - } - - -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java deleted file mode 100644 index ce5db2a..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.njcn.cswarn.pojo.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.db.bo.BaseEntity; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsEquipmentAlarmVO extends BaseEntity { - /** - * id - */ - private String id; - - - /** - * 项目Id - */ - private String projectId; - /** - * 项目名称 - */ - private String projectName; - - /** - * 设备id - */ - private String equipmentId; - - /** - * 设备名称 - */ - private String equipmentName; - - /** - * 告警信息 - */ - private String alarmMsg; - - /** - * 告警级别(字典表) - */ - private String alarmLevel; - - /** - * 告警级别名称 - */ - private String alarmLevelName; - - /** - * 开始时间 - */ - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime startTime; - - /** - * 结束时间 - */ - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime endTime; - - -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEventDetailVO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEventDetailVO.java deleted file mode 100644 index b345bf8..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEventDetailVO.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.njcn.cswarn.pojo.vo; - -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * Description: - * Date: 2023/5/17 10:51【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsEventDetailVO { - - private String projectId; - - private String projectName; - - private String subId; - - private String subName; - /** - * 暂时事件ID - */ - private String eventId; - - /** - * 监测点ID - */ - private String measurementPointId; - - private String lineName; - - - /** - * 统计指标类型 - */ - private String eventType; - - /** - * 暂降原因（字典表PQS_Dicdata） - */ - private String advanceReason; - - /** - * 暂降类型（字典表PQS_Dicdata） - */ - private String advanceType; - - /** - * 事件关联分析表Guid - */ - private String eventassIndex; - - private Double dqTime; - - /** - * 特征值计算更新时间（外键PQS_Relevance的Time字段） - */ - private Date dealTime; - - /** - * 默认事件个数为0 - */ - private Integer num; - - /** - * 波形文件是否从装置招到本地(0：未招，1：已招)默认值为0 - */ - private String fileFlag; - - /** - * 特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0 - */ - private String dealFlag; - - /** - * 处理结果第一条事件发生时间(读comtra文件获取) - */ - private Date firstTime; - - /** - * 处理结果第一条事件暂降类型（字典表PQS_Dicdata） - */ - private String firstType; - - /** - * 处理结果第一条事件发生时间毫秒(读comtra文件获取) - */ - private BigDecimal firstMs; - - /** - * 暂降能量 - */ - private Double energy; - - /** - * 暂降严重度 - */ - private Double severity; - - /** - * 暂降源与监测位置关系 Upper:上游；Lower :下游；Unknown :未知;为空则是未计算 - */ - private String sagsource; - - /** - * 开始时间 - */ - private Date startTime; - - /** - * 持续时间，单位秒 - */ - private BigDecimal duration; - - /** - * 特征幅值 - */ - private BigDecimal featureAmplitude; - - /** - * 相别 - */ - private String phase; - - /** - * 事件描述 - */ - private String eventDescribe; - - /** - * 波形路径 - */ - private String wavePath; - - /** - * 暂态事件上送时间 - */ - private Date createTime; - - private Double transientValue; - - -} \ No newline at end of file diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsStatLimitRateDVO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsStatLimitRateDVO.java deleted file mode 100644 index d185a3e..0000000 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsStatLimitRateDVO.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.njcn.cswarn.pojo.vo; - -import lombok.Data; - -import java.util.Date; - -/** - * - * Description: - * Date: 2023/5/17 13:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class CsStatLimitRateDVO { - - private String projectId; - - private String projectName; - - private String subId; - - private String subName; - - private Date timeId; - - private String myIndex; - - private String lineName; - - private String phasicType; - - private Integer allTime; - - private Integer flickerAllTime; - - private Integer freqDevOvertime; - - private Integer voltageDevOvertime; - - private Integer ubalanceOvertime; - - private Integer flickerOvertime; - - private Integer uaberranceOvertime; - - private Integer uharm2Overtime; - - private Integer uharm3Overtime; - - private Integer uharm4Overtime; - - private Integer uharm5Overtime; - - private Integer uharm6Overtime; - - private Integer uharm7Overtime; - - private Integer uharm8Overtime; - - private Integer uharm9Overtime; - - private Integer uharm10Overtime; - - private Integer uharm11Overtime; - - private Integer uharm12Overtime; - - private Integer uharm13Overtime; - - private Integer uharm14Overtime; - - private Integer uharm15Overtime; - - private Integer uharm16Overtime; - - private Integer uharm17Overtime; - - private Integer uharm18Overtime; - - private Integer uharm19Overtime; - - private Integer uharm20Overtime; - - private Integer uharm21Overtime; - - private Integer uharm22Overtime; - - private Integer uharm23Overtime; - - private Integer uharm24Overtime; - - private Integer uharm25Overtime; - - private Integer iharm2Overtime; - - private Integer iharm3Overtime; - - private Integer iharm4Overtime; - - private Integer iharm5Overtime; - - private Integer iharm6Overtime; - - private Integer iharm7Overtime; - - private Integer iharm8Overtime; - - private Integer iharm9Overtime; - - private Integer iharm10Overtime; - - private Integer iharm11Overtime; - - private Integer iharm12Overtime; - - private Integer iharm13Overtime; - - private Integer iharm14Overtime; - - private Integer iharm15Overtime; - - private Integer iharm16Overtime; - - private Integer iharm17Overtime; - - private Integer iharm18Overtime; - - private Integer iharm19Overtime; - - private Integer iharm20Overtime; - - private Integer iharm21Overtime; - - private Integer iharm22Overtime; - - private Integer iharm23Overtime; - - private Integer iharm24Overtime; - - private Integer iharm25Overtime; - - private Integer inuharm1Overtime; - - private Integer inuharm2Overtime; - - private Integer inuharm3Overtime; - - private Integer inuharm4Overtime; - - private Integer inuharm5Overtime; - - private Integer inuharm6Overtime; - - private Integer inuharm7Overtime; - - private Integer inuharm8Overtime; - - private Integer inuharm9Overtime; - - private Integer inuharm10Overtime; - - private Integer inuharm11Overtime; - - private Integer inuharm12Overtime; - - private Integer inuharm13Overtime; - - private Integer inuharm14Overtime; - - private Integer inuharm15Overtime; - - private Integer inuharm16Overtime; - - private Integer iNegOvertime; -} \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/Dockerfile b/cs-warn/cs-warn-boot/Dockerfile deleted file mode 100644 index 138ccca..0000000 --- a/cs-warn/cs-warn-boot/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM eclipse-temurin:8-jdk-centos7 -MAINTAINER hongawen_13914774158@163.com -ENV JAVA_OPTS="-Xms1024m -Xmx1024m" -# 挂载时区的目录 -VOLUME /usr/share/zoneinfo -# 设置时区为上海 -ENV TZ=Asia/Shanghai -# 设置时区信息 -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -ADD target/csWarnBoot.jar cswarnboot.jar -ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /cswarnboot.jar -EXPOSE 10225 \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/pom.xml b/cs-warn/cs-warn-boot/pom.xml deleted file mode 100644 index d5c2ac6..0000000 --- a/cs-warn/cs-warn-boot/pom.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - cs-warn - com.njcn - 1.0.0 - - 4.0.0 - - cs-warn-boot - 1.0.0 - - cs-warn-boot - - - UTF-8 - 8 - 8 - - - - - com.njcn - common-web - ${project.version} - - - com.njcn - common-swagger - ${project.version} - - - org.mybatis - mybatis-spring - 2.0.5 - - - com.njcn - common-db - ${project.version} - - - com.njcn - cs-warn-api - 1.0.0 - compile - - - com.njcn - cs-device-api - 1.0.0 - compile - - - com.njcn - system-api - 1.0.0 - compile - - - com.baomidou - dynamic-datasource-spring-boot-starter - 3.5.1 - - - - - csWarnBoot - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - -Xlint:unchecked - - - - org.springframework.boot - spring-boot-maven-plugin - - - package - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.2.2 - - - - build-image - ${docker.operate} - - build - - - - - - http://${docker.repostory} - - ${docker.repostory}/${docker.registry.name}/${project.artifactId} - - - latest - - - ${docker.url} - ${basedir}/ - - - - /ROOT - - ${project.build.directory} - - ${project.build.finalName}.jar - - - - - - - diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/CsWarnBootApplication.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/CsWarnBootApplication.java deleted file mode 100644 index 49a57ba..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/CsWarnBootApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.njcn.cswarn; - -import lombok.extern.slf4j.Slf4j; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; - - -/** - * @author hongawen - * @version 1.0.0 - * @date 2021年12月09日 20:59 - */ -@Slf4j -@MapperScan("com.njcn.**.mapper") -@EnableFeignClients(basePackages = "com.njcn") -@SpringBootApplication(scanBasePackages = "com.njcn") -public class CsWarnBootApplication { - - public static void main(String[] args) { - SpringApplication.run(CsWarnBootApplication.class, args); - } - -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEquipmentAlarmController.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEquipmentAlarmController.java deleted file mode 100644 index 4f832bc..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEquipmentAlarmController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.njcn.cswarn.controller.alarm; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.common.pojo.annotation.OperateInfo; -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.cswarn.pojo.parm.CsEquipmentAlarmAddParm; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; -import com.njcn.cswarn.service.CsEquipmentAlarmPOService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * Description: - * Date: 2023/5/16 16:33【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Slf4j -@RestController -@RequestMapping("/EquipmentAlarm") -@Api(tags = "设备警告") -@AllArgsConstructor -public class CsEquipmentAlarmController extends BaseController { - - private final CsEquipmentAlarmPOService csEquipmentAlarmPOService; - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/add") - @ApiOperation("新增设备警告") - @ApiImplicitParam(name = "csEquipmentAlarmAddParm", value = "新增设备警告参数", required = true) - public HttpResult add(@RequestBody @Validated CsEquipmentAlarmAddParm csEquipmentAlarmAddParm){ - String methodDescribe = getMethodDescribe("add"); - CsEquipmentAlarmVO csEquipmentAlarmVO = csEquipmentAlarmPOService.add (csEquipmentAlarmAddParm); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csEquipmentAlarmVO, methodDescribe); - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/queryPage") - @ApiOperation("设备警告分页查询") - @ApiImplicitParam(name = "csEquipmentAlarmPageParm", value = "设备警告查询参数", required = true) - public HttpResult> queryPage(@RequestBody @Validated CsEquipmentAlarmParm.CsEquipmentAlarmPageParm csEquipmentAlarmPageParm ){ - String methodDescribe = getMethodDescribe("queryPage"); - - IPage page = csEquipmentAlarmPOService.queryPage (csEquipmentAlarmPageParm); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } - - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/queryList") - @ApiOperation("设备警告分页查询") - @ApiImplicitParam(name = "csEquipmentAlarm", value = "设备警告查询参数", required = true) - public HttpResult> querList(@RequestBody @Validated CsEquipmentAlarmParm csEquipmentAlarm ){ - String methodDescribe = getMethodDescribe("querList"); - - List list = csEquipmentAlarmPOService.querList (csEquipmentAlarm); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEventDetailPOController.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEventDetailPOController.java deleted file mode 100644 index 69c424a..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEventDetailPOController.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.njcn.cswarn.controller.alarm; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.common.pojo.annotation.OperateInfo; -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.cswarn.pojo.parm.CsEventDetailParm; -import com.njcn.cswarn.pojo.vo.CsEventDetailVO; -import com.njcn.cswarn.service.CsEventDetailPOService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** -* (cs_event_detail)表控制层 -* -* @author xxxxx -*/ -@Slf4j -@RestController -@RequestMapping("/EventAlarm") -@Api(tags = "暂态警告") -@AllArgsConstructor -public class CsEventDetailPOController extends BaseController { - - private final CsEventDetailPOService csEventDetailPOService; - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/queryPage") - @ApiOperation("暂态警告分页查询") - @ApiImplicitParam(name = "csEventDetailPageParm", value = "暂态警告查询参数", required = true) - public HttpResult> queryPage(@RequestBody @Validated CsEventDetailParm.CsEventDetailPageParm csEventDetailPageParm ){ - String methodDescribe = getMethodDescribe("queryPage"); - - IPage page = csEventDetailPOService.queryPage (csEventDetailPageParm); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/queryList") - @ApiOperation("暂态警告分页查询") - @ApiImplicitParam(name = "csEventDetailParm", value = "暂态警告查询参数", required = true) - public HttpResult> queryList(@RequestBody @Validated CsEventDetailParm csEventDetailParm ){ - String methodDescribe = getMethodDescribe("queryList"); - - List page = csEventDetailPOService.queryList (csEventDetailParm); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsStatLimitRateDPOController.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsStatLimitRateDPOController.java deleted file mode 100644 index c250ecb..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsStatLimitRateDPOController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.njcn.cswarn.controller.alarm; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.common.pojo.annotation.OperateInfo; -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.cswarn.pojo.parm.CsStatLimitRatePageParm; -import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; -import com.njcn.cswarn.service.CsStatLimitRateDPOService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -/** -* (cs_stat_limit_rate_d)表控制层 -* -* @author xxxxx -*/ -@Slf4j -@RestController -@RequestMapping("/LimitRateAlarm") -@Api(tags = "稳态警告") -@AllArgsConstructor -public class CsStatLimitRateDPOController extends BaseController { - - - private final CsStatLimitRateDPOService csStatLimitRateDPOService; - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/queryPage") - @ApiOperation("稳态警告分页查询") - @ApiImplicitParam(name = "csStatLimitRatePageParm", value = "设备警告查询参数", required = true) - public HttpResult> queryPage(@RequestBody @Validated CsStatLimitRatePageParm csStatLimitRatePageParm ){ - String methodDescribe = getMethodDescribe("queryPage"); - - IPage page = csStatLimitRateDPOService.queryPage (csStatLimitRatePageParm); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); - } -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEquipmentAlarmPOMapper.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEquipmentAlarmPOMapper.java deleted file mode 100644 index 9215009..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEquipmentAlarmPOMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.njcn.cswarn.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.cswarn.pojo.po.CsEquipmentAlarmPO; - -/** - * Description: - * Date: 2023/5/16 16:25【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface CsEquipmentAlarmPOMapper extends BaseMapper { -} \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEventDetailPOMapper.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEventDetailPOMapper.java deleted file mode 100644 index e7ef0c4..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEventDetailPOMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.cswarn.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.cswarn.pojo.parm.CsEventDetailParm; -import com.njcn.cswarn.pojo.po.CsEventDetailPO; -import com.njcn.cswarn.pojo.vo.CsEventDetailVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Description: - * Date: 2023/5/17 10:51【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface CsEventDetailPOMapper extends BaseMapper { - - Page queryPage(Page returnpage, @Param("lineIds") List lineIds); -} \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsStatLimitRateDPOMapper.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsStatLimitRateDPOMapper.java deleted file mode 100644 index 9a7419f..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsStatLimitRateDPOMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.cswarn.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.cswarn.pojo.parm.CsStatLimitRatePageParm; -import com.njcn.cswarn.pojo.po.CsStatLimitRateDPO; -import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - * Description: - * Date: 2023/5/17 13:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface CsStatLimitRateDPOMapper extends BaseMapper { - Page queryPage(Page returnpage, @Param("lineIds") List lineIds); -} \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsEquipmentAlarmPOMapper.xml b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsEquipmentAlarmPOMapper.xml deleted file mode 100644 index 6aed7cc..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsEquipmentAlarmPOMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - id, project_id, equipment_id, alarm_msg, alarm_level, start_time, end_time, `status`, - create_by, create_time, update_by, update_time - - \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsEventDetailPOMapper.xml b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsEventDetailPOMapper.xml deleted file mode 100644 index d103919..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsEventDetailPOMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - event_id, measurement_point_id, event_type, advance_reason, advance_type, eventass_index, - dq_time, deal_time, num, file_flag, deal_flag, first_time, first_type, first_ms, - energy, severity, sagsource, start_time, duration, feature_amplitude, phase, event_describe, - wave_path, create_time, transient_value - - - - \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsStatLimitRateDPOMapper.xml b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsStatLimitRateDPOMapper.xml deleted file mode 100644 index 1d84d40..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/mapping/CsStatLimitRateDPOMapper.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - time_id, my_index, phasic_type, all_time, flicker_all_time, freq_dev_overtime, voltage_dev_overtime, - ubalance_overtime, flicker_overtime, uaberrance_overtime, uharm_2_overtime, uharm_3_overtime, - uharm_4_overtime, uharm_5_overtime, uharm_6_overtime, uharm_7_overtime, uharm_8_overtime, - uharm_9_overtime, uharm_10_overtime, uharm_11_overtime, uharm_12_overtime, uharm_13_overtime, - uharm_14_overtime, uharm_15_overtime, uharm_16_overtime, uharm_17_overtime, uharm_18_overtime, - uharm_19_overtime, uharm_20_overtime, uharm_21_overtime, uharm_22_overtime, uharm_23_overtime, - uharm_24_overtime, uharm_25_overtime, iharm_2_overtime, iharm_3_overtime, iharm_4_overtime, - iharm_5_overtime, iharm_6_overtime, iharm_7_overtime, iharm_8_overtime, iharm_9_overtime, - iharm_10_overtime, iharm_11_overtime, iharm_12_overtime, iharm_13_overtime, iharm_14_overtime, - iharm_15_overtime, iharm_16_overtime, iharm_17_overtime, iharm_18_overtime, iharm_19_overtime, - iharm_20_overtime, iharm_21_overtime, iharm_22_overtime, iharm_23_overtime, iharm_24_overtime, - iharm_25_overtime, inuharm_1_overtime, inuharm_2_overtime, inuharm_3_overtime, inuharm_4_overtime, - inuharm_5_overtime, inuharm_6_overtime, inuharm_7_overtime, inuharm_8_overtime, inuharm_9_overtime, - inuharm_10_overtime, inuharm_11_overtime, inuharm_12_overtime, inuharm_13_overtime, - inuharm_14_overtime, inuharm_15_overtime, inuharm_16_overtime, i_neg_overtime - - - - \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEquipmentAlarmPOService.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEquipmentAlarmPOService.java deleted file mode 100644 index bd8a25a..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEquipmentAlarmPOService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.cswarn.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; -import com.njcn.cswarn.pojo.po.CsEquipmentAlarmPO; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; - -import java.util.List; - - -/** - * - * Description: - * Date: 2023/5/16 16:24【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface CsEquipmentAlarmPOService extends IService{ - - /** - * @Description: 新增设备警告 - * @Param: - * @return: com.njcn.algorithm.pojo.vo.CsEquipmentAlarmVO - * @Author: clam - * @Date: 2023/5/17 - */ - CsEquipmentAlarmVO add(CsEquipmentAlarmAddParm csEquipmentAlarmAddParm); - - IPage queryPage(CsEquipmentAlarmParm.CsEquipmentAlarmPageParm csEquipmentAlarmPageParm); - - - - List querList(CsEquipmentAlarmParm csEquipmentAlarm); -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEventDetailPOService.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEventDetailPOService.java deleted file mode 100644 index 640172d..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEventDetailPOService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.njcn.cswarn.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.cswarn.pojo.parm.CsEventDetailParm; -import com.njcn.cswarn.pojo.po.CsEventDetailPO; -import com.njcn.cswarn.pojo.vo.CsEventDetailVO; - -import java.util.List; - - -/** - * - * Description: - * Date: 2023/5/17 10:49【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface CsEventDetailPOService extends IService{ - - - IPage queryPage(CsEventDetailParm.CsEventDetailPageParm csEventDetailPageParm); - - List queryList(CsEventDetailParm csEventDetailPageParm); -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsStatLimitRateDPOService.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsStatLimitRateDPOService.java deleted file mode 100644 index b6564b5..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsStatLimitRateDPOService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.cswarn.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.cswarn.pojo.parm.CsStatLimitRatePageParm; -import com.njcn.cswarn.pojo.po.CsStatLimitRateDPO; -import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; - - -/** - * - * Description: - * Date: 2023/5/17 13:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface CsStatLimitRateDPOService extends IService{ - - - IPage queryPage(CsStatLimitRatePageParm csStatLimitRatePageParm); - } diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java deleted file mode 100644 index f7920de..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.njcn.cswarn.service.impl; - -import com.alibaba.cloud.commons.lang.StringUtils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.csdevice.api.AppProjectFeignClient; -import com.njcn.csdevice.api.EquipmentFeignClient; -import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; -import com.njcn.csdevice.pojo.po.AppProjectPO; -import com.njcn.cswarn.mapper.CsEquipmentAlarmPOMapper; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; -import com.njcn.cswarn.pojo.po.CsEquipmentAlarmPO; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; -import com.njcn.cswarn.service.CsEquipmentAlarmPOService; -import com.njcn.system.api.DicDataFeignClient; -import com.njcn.system.enums.DicDataTypeEnum; -import com.njcn.system.pojo.po.DictData; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static java.util.stream.Collectors.toList; - -/** - * - * Description: - * Date: 2023/5/16 16:24【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class CsEquipmentAlarmPOServiceImpl extends ServiceImpl implements CsEquipmentAlarmPOService { - - private final EquipmentFeignClient equipmentFeignClient; - private final AppProjectFeignClient appProjectFeignClient; - private final DicDataFeignClient dicDataFeignClient; - - @Override - @Transactional(rollbackFor = {Exception.class}) - public CsEquipmentAlarmVO add(CsEquipmentAlarmAddParm csEquipmentAlarmAddParm) { - CsEquipmentAlarmPO csEquipmentAlarmPO = new CsEquipmentAlarmPO(); - BeanUtils.copyProperties(csEquipmentAlarmAddParm,csEquipmentAlarmPO); - csEquipmentAlarmPO.setStatus("1"); - csEquipmentAlarmPO.setDealFlag("0"); - this.save(csEquipmentAlarmPO); - - CsEquipmentAlarmVO csEquipmentAlarmVO = new CsEquipmentAlarmVO(); - - List data = equipmentFeignClient.queryDeviceById(Stream.of(csEquipmentAlarmAddParm.getEquipmentId()).collect(toList())).getData(); - List data1 = appProjectFeignClient.queryProjectById(Stream.of(csEquipmentAlarmAddParm.getProjectId()).collect(toList())).getData(); - List data3 = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.ALARM_TYPE.getCode()).getData(); - - Map collect3 = data.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, CsEquipmentDeliveryDTO::getName)); - Map collect4 = data1.stream().collect(Collectors.toMap(AppProjectPO::getId, AppProjectPO::getName)); - Map collect5 = data3.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - csEquipmentAlarmVO.setEquipmentName(collect3.get(csEquipmentAlarmAddParm.getEquipmentId())); - csEquipmentAlarmVO.setAlarmLevelName(collect4.get(csEquipmentAlarmAddParm.getAlarmLevel())); - csEquipmentAlarmVO.setProjectName(collect5.get(csEquipmentAlarmAddParm.getProjectId())); - log.info("新增设备警告：{}", csEquipmentAlarmVO.toString()); - return csEquipmentAlarmVO; - - } - - @Override - public IPage queryPage(CsEquipmentAlarmParm.CsEquipmentAlarmPageParm csEquipmentAlarmPageParm) { - Page returnpage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( )); - Page queryPage = new Page<> (csEquipmentAlarmPageParm.getPageNum ( ), csEquipmentAlarmPageParm.getPageSize ( )); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("status", "1"); - queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmPageParm.getProjectId()); - queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getEquipmentId()),CsEquipmentAlarmPO.COL_EQUIPMENT_ID,csEquipmentAlarmPageParm.getEquipmentId()); - queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmPageParm.getAlarmLevel()),CsEquipmentAlarmPO.COL_ALARM_LEVEL,csEquipmentAlarmPageParm.getAlarmLevel()); - queryWrapper.ge(Objects.nonNull(csEquipmentAlarmPageParm.getStartTime()),CsEquipmentAlarmPO.COL_START_TIME,csEquipmentAlarmPageParm.getStartTime()); - queryWrapper.le(Objects.nonNull(csEquipmentAlarmPageParm.getStartTime()),CsEquipmentAlarmPO.COL_START_TIME,csEquipmentAlarmPageParm.getEndTime()); - queryWrapper.orderByDesc("create_time"); - - Page csEquipmentAlarmPOPage = this.getBaseMapper().selectPage(queryPage, queryWrapper); - List collect1 = csEquipmentAlarmPOPage.getRecords().stream().map(CsEquipmentAlarmPO::getProjectId).distinct().collect(toList()); - List collect2 = csEquipmentAlarmPOPage.getRecords().stream().map(CsEquipmentAlarmPO::getEquipmentId).distinct().collect(toList()); - - List data = equipmentFeignClient.queryDeviceById(collect2).getData(); - List data1 = appProjectFeignClient.queryProjectById(collect1).getData(); - List data3 = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.ALARM_TYPE.getCode()).getData(); - - Map collect3 = data.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, CsEquipmentDeliveryDTO::getName)); - Map collect4 = data1.stream().collect(Collectors.toMap(AppProjectPO::getId, AppProjectPO::getName)); - Map collect5 = data3.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - - - List collect = csEquipmentAlarmPOPage.getRecords().stream().map(temp -> { - CsEquipmentAlarmVO csEquipmentAlarmVO = new CsEquipmentAlarmVO(); - csEquipmentAlarmVO.setEquipmentName(collect3.get(temp.getEquipmentId())); - csEquipmentAlarmVO.setAlarmLevelName(collect4.get(temp.getAlarmLevel())); - csEquipmentAlarmVO.setProjectName(collect5.get(temp.getProjectId())); - return csEquipmentAlarmVO; - }).collect(toList()); - returnpage.setRecords(collect); - return returnpage; - } - - @Override - public List querList(CsEquipmentAlarmParm csEquipmentAlarmParm) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - - queryWrapper.eq("status", "1"); - queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmParm.getProjectId()),CsEquipmentAlarmPO.COL_PROJECT_ID,csEquipmentAlarmParm.getProjectId()); - queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmParm.getEquipmentId()),CsEquipmentAlarmPO.COL_EQUIPMENT_ID,csEquipmentAlarmParm.getEquipmentId()); - queryWrapper.eq(StringUtils.isNotBlank(csEquipmentAlarmParm.getAlarmLevel()),CsEquipmentAlarmPO.COL_ALARM_LEVEL,csEquipmentAlarmParm.getAlarmLevel()); - queryWrapper.ge(Objects.nonNull(csEquipmentAlarmParm.getStartTime()),CsEquipmentAlarmPO.COL_START_TIME,csEquipmentAlarmParm.getStartTime()); - queryWrapper.le(Objects.nonNull(csEquipmentAlarmParm.getStartTime()),CsEquipmentAlarmPO.COL_START_TIME,csEquipmentAlarmParm.getEndTime()); - queryWrapper.orderByDesc("create_time"); - - List csEquipmentAlarmPOS = this.getBaseMapper().selectList(queryWrapper); - List collect1 = csEquipmentAlarmPOS.stream().map(CsEquipmentAlarmPO::getProjectId).distinct().collect(toList()); - List collect2 = csEquipmentAlarmPOS.stream().map(CsEquipmentAlarmPO::getEquipmentId).distinct().collect(toList()); - - List data = equipmentFeignClient.queryDeviceById(collect2).getData(); - List data1 = appProjectFeignClient.queryProjectById(collect1).getData(); - List data3 = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.ALARM_TYPE.getCode()).getData(); - - Map collect3 = data.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, CsEquipmentDeliveryDTO::getName)); - Map collect4 = data1.stream().collect(Collectors.toMap(AppProjectPO::getId, AppProjectPO::getName)); - Map collect5 = data3.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - - - List collect = csEquipmentAlarmPOS.stream().map(temp -> { - CsEquipmentAlarmVO csEquipmentAlarmVO = new CsEquipmentAlarmVO(); - BeanUtils.copyProperties(temp, csEquipmentAlarmVO); - csEquipmentAlarmVO.setEquipmentName(collect3.get(temp.getEquipmentId())); - csEquipmentAlarmVO.setAlarmLevelName(collect5.get(temp.getAlarmLevel())); - csEquipmentAlarmVO.setProjectName(collect4.get(temp.getProjectId())); - return csEquipmentAlarmVO; - }).collect(toList()); - - return collect; - } - - -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java deleted file mode 100644 index 116e3cf..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.njcn.cswarn.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.csdevice.api.CsLedgerFeignClient; -import com.njcn.csdevice.pojo.dto.LineParamDTO; -import com.njcn.csdevice.pojo.po.CsLedger; -import com.njcn.cswarn.mapper.CsEventDetailPOMapper; -import com.njcn.cswarn.pojo.parm.CsEventDetailParm; -import com.njcn.cswarn.pojo.po.CsEventDetailPO; -import com.njcn.cswarn.pojo.vo.CsEventDetailVO; -import com.njcn.cswarn.service.CsEventDetailPOService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * - * Description: - * Date: 2023/5/17 10:49【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class CsEventDetailPOServiceImpl extends ServiceImpl implements CsEventDetailPOService { - private final CsLedgerFeignClient csLedgerFeignClient; - @Override - public IPage queryPage(CsEventDetailParm.CsEventDetailPageParm csEventDetailPageParm) { - Page returnpage = new Page<> (csEventDetailPageParm.getPageNum ( ), csEventDetailPageParm.getPageSize ( )); - List lineIds = new ArrayList<>(); - if(Objects.nonNull(csEventDetailPageParm.getLineId())){ - lineIds.add(csEventDetailPageParm.getLineId()); - }else { - LineParamDTO lineParamDTO = new LineParamDTO(); - BeanUtils.copyProperties(csEventDetailPageParm, lineParamDTO); - List data = csLedgerFeignClient.queryLine(lineParamDTO).getData(); - List collect = data.stream().map(CsLedger::getId).collect(Collectors.toList()); - lineIds.addAll(collect); - } - if (CollectionUtils.isEmpty(lineIds)){ - return returnpage; - } - - returnpage = this.getBaseMapper().queryPage(returnpage,lineIds); - return returnpage; - } - - @Override - public List queryList(CsEventDetailParm csEventDetailPageParm) { - return null; - } -} diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java deleted file mode 100644 index 84e4caa..0000000 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.njcn.cswarn.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.csdevice.api.CsLedgerFeignClient; -import com.njcn.csdevice.pojo.dto.LineParamDTO; -import com.njcn.csdevice.pojo.po.CsLedger; -import com.njcn.cswarn.mapper.CsStatLimitRateDPOMapper; -import com.njcn.cswarn.pojo.parm.CsStatLimitRatePageParm; -import com.njcn.cswarn.pojo.po.CsStatLimitRateDPO; -import com.njcn.cswarn.pojo.vo.CsEventDetailVO; -import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; -import com.njcn.cswarn.service.CsStatLimitRateDPOService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * - * Description: - * Date: 2023/5/17 13:45【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class CsStatLimitRateDPOServiceImpl extends ServiceImpl implements CsStatLimitRateDPOService { - private final CsLedgerFeignClient csLedgerFeignClient; - - @Override - public IPage queryPage(CsStatLimitRatePageParm csStatLimitRatePageParm) { - Page returnpage = new Page<> (csStatLimitRatePageParm.getPageNum ( ), csStatLimitRatePageParm.getPageSize ( )); - List lineIds = new ArrayList<>(); - if(Objects.nonNull(csStatLimitRatePageParm.getLineId())){ - lineIds.add(csStatLimitRatePageParm.getLineId()); - }else { - LineParamDTO lineParamDTO = new LineParamDTO(); - BeanUtils.copyProperties(csStatLimitRatePageParm, lineParamDTO); - List data = csLedgerFeignClient.queryLine(lineParamDTO).getData(); - List collect = data.stream().map(CsLedger::getId).collect(Collectors.toList()); - lineIds.addAll(collect); - } - if (CollectionUtils.isEmpty(lineIds)){ - return returnpage; - } - - returnpage = this.getBaseMapper().queryPage(returnpage,lineIds); - return returnpage; - } -} diff --git a/cs-warn/cs-warn-boot/src/main/resources/bootstrap.yml b/cs-warn/cs-warn-boot/src/main/resources/bootstrap.yml deleted file mode 100644 index 81f53c4..0000000 --- a/cs-warn/cs-warn-boot/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,51 +0,0 @@ -#当前服务的基本信息 -microservice: - ename: @artifactId@ - name: '@name@' - version: @version@ - sentinel: - url: @sentinel.url@ - gateway: - url: @gateway.url@ -server: - port: 10225 -#feign接口开启服务熔断降级处理 -feign: - sentinel: - enabled: true -spring: - application: - name: @artifactId@ - cloud: - nacos: - discovery: - ip: @service.server.url@ - server-addr: @nacos.url@ - namespace: @nacos.namespace@ - config: - server-addr: @nacos.url@ - namespace: @nacos.namespace@ - file-extension: yaml - shared-configs: - - data-id: share-config.yaml - refresh: true - - data-Id: algorithm-config.yaml - refresh: true - main: - allow-bean-definition-overriding: true - - -#项目日志的配置 -logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml - level: - root: info - - -#mybatis配置信息 -mybatis-plus: - #别名扫描 - type-aliases-package: com.njcn.warn.pojo - -mqtt: - client-id: @artifactId@${random.value} \ No newline at end of file diff --git a/cs-warn/cs-warn-boot/src/test/java/com/njcn/AppTest.java b/cs-warn/cs-warn-boot/src/test/java/com/njcn/AppTest.java deleted file mode 100644 index 17c8f16..0000000 --- a/cs-warn/cs-warn-boot/src/test/java/com/njcn/AppTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn; - -import org.junit.Test; - -import static org.junit.Assert.assertTrue; - -/** - * Unit test for simple App. - */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); - } -} diff --git a/cs-warn/pom.xml b/cs-warn/pom.xml deleted file mode 100644 index 1554164..0000000 --- a/cs-warn/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - govern - com.njcn - 1.0.0 - - 4.0.0 - - cs-warn - pom - 1.0.0 - - cs-warn-api - cs-warn-boot - - - cs-warn - 治理告警/事件模块 - - - UTF-8 - 8 - 8 - - diff --git a/pom.xml b/pom.xml index 9d4043b..167d5ef 100644 --- a/pom.xml +++ b/pom.xml @@ -10,10 +10,8 @@ cs-device cs-harmonic - cs-event cs-report cs-system - cs-warn govern @@ -29,7 +27,7 @@ ${middle.server.url}:18848 - fd74182b-1fce-4dba-afa7-2623b0376205 + 415a1c87-33aa-47bd-8e25-13cc456c87ed ${middle.server.url}:8080