Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

将终端台账拆分为pq&pms两类

Browse Source
This commit is contained in:
hongawen
2022-09-29 19:43:14 +08:00
parent 5385e7521b
commit ab8e86f257
530 changed files with 5060 additions and 1863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@@ -40,21 +40,21 @@
<!--中间件目标地址--> <!--中间件目标地址-->
<middle.server.url>192.168.1.13</middle.server.url> <middle.server.url>192.168.1.13</middle.server.url>
<!--微服务模块发布地址--> <!--微服务模块发布地址-->
<service.server.url>192.168.1.130</service.server.url> <service.server.url>192.168.1.111</service.server.url>
<!--nacos的ip:port--> <!--nacos的ip:port-->
<nacos.url>${middle.server.url}:18848</nacos.url> <nacos.url>${middle.server.url}:18848</nacos.url>
<!--服务器发布内容为空--> <!--服务器发布内容为空-->
<!-- <nacos.namespace></nacos.namespace>--> <!-- <nacos.namespace></nacos.namespace>-->
<nacos.namespace>722a16dc-6988-419e-96e9-de885508296b</nacos.namespace> <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>
<!--sentinel:port--> <!--sentinel:port-->
<!-- <sentinel.url>192.168.1.14:8080</sentinel.url>--> <!-- <sentinel.url>192.168.1.14:8080</sentinel.url>-->
<sentinel.url>${middle.server.url}:8080</sentinel.url> <sentinel.url>${middle.server.url}:8080</sentinel.url>
<!--网关地址，主要用于配置swagger中认证token--> <!--网关地址，主要用于配置swagger中认证token-->
<gateway.url>${service.server.url}:10215</gateway.url> <gateway.url>${service.server.url}:10215</gateway.url>
<!--docker远程守护进程的url--> <!--docker远程守护进程的url-->
<docker.url>http://${middle.server.url}:2375</docker.url> <docker.url>http://192.168.1.13:2375</docker.url>
<!--docker远程harbor，url--> <!--docker远程harbor，url-->
<docker.repostory>${middle.server.url}:8090</docker.repostory> <docker.repostory>192.168.1.13:8090</docker.repostory>
<!--docker远程项目仓库名--> <!--docker远程项目仓库名-->
<docker.registry.name>njcn</docker.registry.name> <docker.registry.name>njcn</docker.registry.name>
<docker.operate>deploy</docker.operate> <docker.operate>deploy</docker.operate>
@@ -268,6 +268,11 @@
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>${jackson}</version> <version>${jackson}</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson}</version>
</dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId> <artifactId>easyexcel</artifactId>

2
pqs-advance/advance-boot/pom.xml
View File

@@ -27,7 +27,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.njcn</groupId> <groupId>com.njcn</groupId>
<artifactId>device-api</artifactId> <artifactId>pq-device-api</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

4
pqs-common/common-core/pom.xml
View File

@@ -91,6 +91,10 @@
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!--mqtt相关依赖--> <!--mqtt相关依赖-->
<dependency> <dependency>
<groupId>com.github.tocrhz</groupId> <groupId>com.github.tocrhz</groupId>

1
pqs-common/common-influxdb/pom.xml
View File

@@ -21,7 +21,6 @@
<dependency> <dependency>
<groupId>org.influxdb</groupId> <groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId> <artifactId>influxdb-java</artifactId>
<version>${influxdb-java.version}</version>
</dependency> </dependency>
<dependency> <dependency>

25
pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbOkHttpClientBuilderProvider.java Normal file
View File

@@ -0,0 +1,25 @@
//package com.njcn.influxdb.config;
//
///**
// * @author hongawen
// * @version 1.0.0
// * @date 2022年09月20日 22:24
// */
//
//import okhttp3.OkHttpClient;
//import org.springframework.context.annotation.Configuration;
//
//import java.util.concurrent.TimeUnit;
//
//@Configuration
//public class InfluxDbOkHttpClientBuilderProvider implements org.springframework.boot.autoconfigure.influx.InfluxDbOkHttpClientBuilderProvider {
//
// @Override
// public OkHttpClient.Builder get() {
// // 设置超时时间为100秒
// return new OkHttpClient.Builder()
// .connectTimeout(100, TimeUnit.SECONDS)
// .readTimeout(100, TimeUnit.SECONDS)
// .writeTimeout(100, TimeUnit.SECONDS);
// }
//}

2
pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/param/InfluxDBPublicParam.java
View File

@@ -12,7 +12,7 @@ public interface InfluxDBPublicParam {
/** /**
* influxDB数据库名称 * influxDB数据库名称
*/ */
String DATABASE = "pqsbase"; String DATABASE = "PQSBASE";
/** /**
* 暂态事件汇总表 * 暂态事件汇总表

9
pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java
View File

@@ -3,6 +3,7 @@ package com.njcn.influxdb.utils;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
import org.influxdb.InfluxDB; import org.influxdb.InfluxDB;
import org.influxdb.InfluxDB.ConsistencyLevel; import org.influxdb.InfluxDB.ConsistencyLevel;
import org.influxdb.InfluxDBFactory; import org.influxdb.InfluxDBFactory;
@@ -31,6 +32,10 @@ import java.util.concurrent.TimeUnit;
@Slf4j @Slf4j
@Data @Data
public class InfluxDbUtils { public class InfluxDbUtils {
static OkHttpClient.Builder client = new OkHttpClient.Builder()
.connectTimeout(1000,TimeUnit.SECONDS)
.readTimeout(1000, TimeUnit.SECONDS)
.writeTimeout(1000, TimeUnit.SECONDS);
private static final int FRACTION_MIN_WIDTH = 0; private static final int FRACTION_MIN_WIDTH = 0;
private static final int FRACTION_MAX_WIDTH = 9; private static final int FRACTION_MAX_WIDTH = 9;
private static final boolean ADD_DECIMAL_POINT = true; private static final boolean ADD_DECIMAL_POINT = true;
@@ -70,7 +75,7 @@ public class InfluxDbUtils {
*/ */
public InfluxDB influxDbBuild() { public InfluxDB influxDbBuild() {
if (influxDB == null) { if (influxDB == null) {
influxDB = InfluxDBFactory.connect(openurl, username, password); influxDB = InfluxDBFactory.connect(openurl, username, password,client);
} }
try { try {
// if (!influxDB.databaseExists(database)) { // if (!influxDB.databaseExists(database)) {
@@ -87,6 +92,8 @@ public class InfluxDbUtils {
} }
/** /**
* 创建数据库 * 创建数据库
* *

28
pqs-common/common-influxdb/src/test/java/DataTest.java
View File

@@ -1,12 +1,16 @@
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.PubUtils;
import com.njcn.event.pojo.po.EventDetail; import com.njcn.event.pojo.po.EventDetail;
import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.influxdb.utils.InfluxDbUtils;
import feign.Util;
import org.influxdb.InfluxDB.ConsistencyLevel; import org.influxdb.InfluxDB.ConsistencyLevel;
import org.influxdb.dto.BatchPoints; import org.influxdb.dto.BatchPoints;
import org.influxdb.dto.Point; import org.influxdb.dto.Point;
import org.influxdb.dto.QueryResult; import org.influxdb.dto.QueryResult;
import org.influxdb.impl.InfluxDBResultMapper; import org.influxdb.impl.InfluxDBResultMapper;
import java.time.Instant;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -59,19 +63,27 @@ public class DataTest {
} }
public static void main(String[] args) { public static void main(String[] args) {
InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "123456", "http://192.168.1.18:8086", "pqsbase", ""); InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "PQSBASE", "");
insert(influxDBUtil); String sql = "select * from pqs_eventdetail limit 10";
Map<String, String> tags = new HashMap<>(); //获取暂降事件
long time = Long.parseLong("1657959227000"); QueryResult result = influxDBUtil.query(sql);
tags.put("line_id","656da093bdb523b6ac619067a4045624"); InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
Map<String, Object> fields = new HashMap<>(); List<EventDetail> eventDetailList = influxDBResultMapper.toPOJO(result, EventDetail.class);
fields.put("statis_value",1024000000.00); String bodyStr = PubUtils.obj2json(eventDetailList.get(0));
influxDBUtil.insert("cld_month_flow", tags, fields, time, TimeUnit.MILLISECONDS); //对结果进行转换
EventDetail o = PubUtils.json2obj(bodyStr, EventDetail.class);
Instant timeId = o.getTimeId();
System.out.println(timeId);
System.out.println(1);
//select(influxDBUtil); //select(influxDBUtil);
} }
public static void deleteDB(InfluxDbUtils influxDBUtil) { public static void deleteDB(InfluxDbUtils influxDBUtil) {
influxDBUtil.deleteDB("LIMIT_RATE"); influxDBUtil.deleteDB("LIMIT_RATE");
} }
//单条数据插入 //单条数据插入
public static void insert(InfluxDbUtils influxDBUtil) { public static void insert(InfluxDbUtils influxDBUtil) {
Map<String, String> tags = new HashMap<>(); Map<String, String> tags = new HashMap<>();

4
pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
View File

@@ -53,8 +53,8 @@ public class Knife4jSwaggerConfig {
public Docket defaultApi() { public Docket defaultApi() {
List<String> controllerPath = Stream.of( List<String> controllerPath = Stream.of(
"com.njcn.user.controller", "com.njcn.user.controller",
"com.njcn.device.controller", "com.njcn.device.pq.controller",
"com.njcn.pvdevice.controller", "com.njcn.device.pms.controller",
"com.njcn.auth.controller", "com.njcn.auth.controller",
"com.njcn.system.controller", "com.njcn.system.controller",
"com.njcn.harmonic.controller", "com.njcn.harmonic.controller",

12
pqs-device/device-api/pom.xml → pqs-device/common-device-biz/pom.xml
View File

@@ -7,12 +7,10 @@
<groupId>com.njcn</groupId> <groupId>com.njcn</groupId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>device-api</artifactId> <artifactId>common-device-biz</artifactId>
<name>终端配置对外接口</name> <packaging>jar</packaging>
<name>台账通用业务</name>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
@@ -20,6 +18,7 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.njcn</groupId> <groupId>com.njcn</groupId>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
@@ -46,7 +45,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
pqs-device/device-api/src/main/java/com/njcn/device/enums/LineFlagEnum.java → pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/LineFlagEnum.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.enums; package com.njcn.device.biz.enums;
import lombok.Getter; import lombok.Getter;

32
pqs-device/device-boot/pom.xml
View File

@@ -21,44 +21,22 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.njcn</groupId> <groupId>com.njcn</groupId>
<artifactId>device-api</artifactId> <artifactId>pq-device-boot</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.njcn</groupId> <groupId>com.njcn</groupId>
<artifactId>user-api</artifactId> <artifactId>pms-device-boot</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>system-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>event-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-web</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.njcn</groupId> <groupId>com.njcn</groupId>
<artifactId>common-swagger</artifactId> <artifactId>common-swagger</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-influxDB</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-thymeleaf</artifactId>-->
<!-- </dependency>-->
</dependencies> </dependencies>
<build> <build>

3
pqs-device/device-boot/src/main/java/com/njcn/device/DeviceBootApplication.java → pqs-device/device-boot/src/main/java/com/njcn/DeviceBootApplication.java
View File

@@ -1,10 +1,9 @@
package com.njcn.device; package com.njcn;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
/** /**

5
pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/FlowStrategyMapper.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.mapper.FlowStrategyMapper">
</mapper>

5
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDispatchMapper.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvDispatchMapper">
</mapper>

2
pqs-device/device-boot/src/main/resources/bootstrap.yml
View File

@@ -53,7 +53,7 @@ logging:
#mybatis配置信息 #mybatis配置信息
mybatis-plus: mybatis-plus:
#别名扫描 #别名扫描
type-aliases-package: com.njcn.device.pojo type-aliases-package: com.njcn.device.pq.pojo,com.njcn.device.pms.pojo,
mqtt: mqtt:

1
pqs-device/device-boot/src/test/java/com/njcn/BaseJunitTest.java
View File

@@ -1,6 +1,5 @@
package com.njcn; package com.njcn;
import com.njcn.device.DeviceBootApplication;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;

10
pqs-device/device-boot/src/test/java/com/njcn/DeviceTest.java
View File

@@ -1,7 +1,8 @@
/*
package com.njcn; package com.njcn;
import com.njcn.device.pojo.po.DeptLine; import com.njcn.device.pq.pojo.po.DeptLine;
import com.njcn.device.service.DeptLineService; import com.njcn.device.pq.service.DeptLineService;
import com.njcn.web.pojo.param.DeptLineParam; import com.njcn.web.pojo.param.DeptLineParam;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -12,11 +13,13 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
*/
/** /**
* @author hongawen * @author hongawen
* @version 1.0.0 * @version 1.0.0
* @date 2021年12月14日 12:55 * @date 2021年12月14日 12:55
*/ *//*
public class DeviceTest extends BaseJunitTest { public class DeviceTest extends BaseJunitTest {
@Autowired @Autowired
@@ -44,3 +47,4 @@ public class DeviceTest extends BaseJunitTest {
} }
*/

26
pqs-device/pms-device/pms-device-api/pom.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>pms-device</artifactId>
<groupId>com.njcn</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pms-device-api</artifactId>
<name>pms终端配置对外接口</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-device-biz</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

47
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java Normal file
View File

@@ -0,0 +1,47 @@
package com.njcn.device.pms.pojo.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.device.pms.pojo.vo.DeviceRunExVO;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 终端异常信息类
* @author yangj
* @date 2022/09/14
*/
@Data
public class DeviceRunExBO extends DeviceRunExVO implements Serializable {
private String id;
private String pid;
private String pidS;
private String name;
private Integer level;
private Integer sort;
private String remark;
private Integer state;
private String createBy;
@JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date createTime;
private String updateBy;
@JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date updateTime;
private List<DeviceRunExBO> children;
}

46
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/DeviceRunExDTO.java Normal file
View File

@@ -0,0 +1,46 @@
package com.njcn.device.pms.pojo.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
/**
* 终端运行异常条件查询
*
* @author yangj
* @date 2022/09/08
*/
@Data
public class DeviceRunExDTO {
/**
* 起始时间
*/
@ApiModelProperty("起始时间")
@NotNull
@Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式不正确")
private String startTime;
/**
* 结束时间
*/
@ApiModelProperty("结束时间")
@NotNull
@Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式不正确")
private String endTime;
/**
* 监测点等级
*/
@ApiModelProperty("监测点等级：0-全部；1-极重要；2-重要；3-普通；4-不重要；")
@NotNull(message = "监测点等级不可为空")
@Max(value = 4)
@Min(value = 0)
private String lineLevel;
}

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DeviceQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/DistributedQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LineDetailQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/LvUserQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDeviceParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java
View File

@@ -1,8 +1,7 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import com.njcn.web.pojo.annotation.DateTimeStrValid; import com.njcn.web.pojo.annotation.DateTimeStrValid;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
/** /**
* <p> * <p>

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDispatchParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java
View File

@@ -1,7 +1,6 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

7
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvDistributedParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java
View File

@@ -1,19 +1,14 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>

6
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLineDetailParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java
View File

@@ -1,20 +1,16 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import com.njcn.web.pojo.annotation.DateTimeStrValid; import com.njcn.web.pojo.annotation.DateTimeStrValid;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvLvUserParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java
View File

@@ -1,8 +1,6 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

5
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubAreaParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java
View File

@@ -1,15 +1,12 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvSubstationParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java
View File

@@ -1,6 +1,5 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

5
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTenVoltageParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java
View File

@@ -1,8 +1,6 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import com.njcn.web.pojo.annotation.DateTimeStrValid; import com.njcn.web.pojo.annotation.DateTimeStrValid;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +10,6 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvTerminalBaseQuery.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java
View File

@@ -1,14 +1,12 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/** /**
* pqs * pqs

5
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvUnitParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java
View File

@@ -1,13 +1,10 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;

6
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/PvVoltageParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java
View File

@@ -1,14 +1,10 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.db.bo.BaseEntity;
import com.njcn.web.constant.ValidMessage; import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubAreaQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/SubstationQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java
View File

@@ -1,11 +1,10 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.util.List; import java.util.List;
/** /**

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/TenVoltageQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java
View File

@@ -1,11 +1,10 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.util.List; import java.util.List;
/** /**

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/param/pv/VoltageQueryParam.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.param.pv; package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

10
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDevice.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java
View File

@@ -1,15 +1,11 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter; import java.time.LocalDate;
/** /**
* <p> * <p>

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDispatch.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java
View File

@@ -1,8 +1,7 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

11
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvDistributed.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java
View File

@@ -1,17 +1,12 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter; import java.time.LocalDate;
/** /**
* <p> * <p>

11
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLineDetail.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java
View File

@@ -1,16 +1,11 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter; import java.time.LocalDate;
/** /**
* <p> * <p>

7
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvLvUser.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java
View File

@@ -1,14 +1,9 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>

7
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubArea.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java
View File

@@ -1,14 +1,9 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>

7
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvSubstation.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java
View File

@@ -1,12 +1,7 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>

9
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvTenVoltage.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java
View File

@@ -1,13 +1,10 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter; import java.time.LocalDateTime;
/** /**
* <p> * <p>

6
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvUnit.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java
View File

@@ -1,11 +1,11 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
/** /**
* <p> * <p>
* *

7
pqs-device/device-api/src/main/java/com/njcn/device/pojo/po/pv/PvVoltage.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java
View File

@@ -1,12 +1,7 @@
package com.njcn.device.pojo.po.pv; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>

71
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java Normal file
View File

@@ -0,0 +1,71 @@
package com.njcn.device.pms.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 终端运行异常列表信息
*
* @author yangj
* @date 2022/09/08
*/
@Data
public class DeviceRunExVO implements Serializable {
/**
* 日期
*/
@ApiModelProperty("日期")
@JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd",timezone = "GMT+8")
private String time;
/**
* 告警描述
*/
@ApiModelProperty("告警描述")
private String alarmDesc;
/**
* 告警统计
*/
@ApiModelProperty("告警统计")
private Long alarmNum;
/**
* 中断描述
*/
@ApiModelProperty("中断描述")
private String comOutDesc;
/**
* 中断统计
*/
@ApiModelProperty("中断统计")
private Long comOutNum;
/**
* 终端id
*/
@ApiModelProperty("终端id")
private String devId;
/**
* 终端流量
*/
@ApiModelProperty("终端流量")
private Long flowNum;
private Long flowStand;
private Long overLimit;
private Integer state;
}

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/DisOrLvVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDeviceVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java
View File

@@ -1,6 +1,6 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import com.njcn.device.pojo.po.pv.PvDevice; import com.njcn.device.pms.pojo.po.PvDevice;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvDistributedVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java
View File

@@ -1,6 +1,6 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import com.njcn.device.pojo.po.pv.PvDistributed; import com.njcn.device.pms.pojo.po.PvDistributed;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLineAllDetailVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java
View File

@@ -1,9 +1,8 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List;
/** /**
* pqs * pqs

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvLvUserVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java
View File

@@ -1,6 +1,6 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import com.njcn.device.pojo.po.pv.PvLvUser; import com.njcn.device.pms.pojo.po.PvLvUser;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubAreaVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java
View File

@@ -1,6 +1,6 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import com.njcn.device.pojo.po.pv.PvSubArea; import com.njcn.device.pms.pojo.po.PvSubArea;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvSubstationVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import lombok.Data; import lombok.Data;

7
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/PvTenVoltageVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java
View File

@@ -1,9 +1,6 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.njcn.device.pms.pojo.po.PvTenVoltage;
import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
import com.njcn.device.pojo.po.pv.PvTenVoltage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

2
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/pv/UnitTreeVO.java → pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pojo.vo.pv; package com.njcn.device.pms.pojo.vo;
import lombok.Data; import lombok.Data;

55
pqs-device/pms-device/pms-device-boot/pom.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>pms-device</artifactId>
<groupId>com.njcn</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pms-device-boot</artifactId>
<packaging>jar</packaging>
<name>pms终端模块核心业务</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>pms-device-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>user-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>system-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>event-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-web</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-influxDB</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

15
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDeviceController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,11 +8,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.DeviceQueryParam; import com.njcn.device.pms.pojo.param.DeviceQueryParam;
import com.njcn.device.pojo.param.pv.PvDeviceParam; import com.njcn.device.pms.pojo.param.PvDeviceParam;
import com.njcn.device.pojo.po.pv.PvDevice; import com.njcn.device.pms.pojo.po.PvDevice;
import com.njcn.device.pojo.vo.pv.PvDeviceVO; import com.njcn.device.pms.pojo.vo.PvDeviceVO;
import com.njcn.pvdevice.service.IPvDeviceService; import com.njcn.device.pms.service.IPvDeviceService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

48
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.java Normal file
View File

@@ -0,0 +1,48 @@
package com.njcn.device.pms.controller;
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.device.pms.pojo.bo.DeviceRunExBO;
import com.njcn.device.pms.pojo.dto.DeviceRunExDTO;
import com.njcn.device.pms.service.IPvDeviceRunExService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
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;
/**
* pv终端运行异常
*
* @author yangj
* @date 2022/09/08
*/
@RestController
@RequestMapping("/pvDeviceEx")
@Api(tags = "pv终端运行异常")
@RequiredArgsConstructor
public class PvDeviceRunExController extends BaseController {
private final IPvDeviceRunExService pvDeviceRunExService;
@PostMapping("getPvDeviceExList")
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@ApiOperation("分页条件查询终端异常")
@ApiImplicitParam(name = "deviceRunExDTO",value = "终端异常",required = true)
public HttpResult<List<DeviceRunExBO>> getPvDeviceExList(@RequestBody DeviceRunExDTO deviceRunExDTO) {
String methodDescribe = getMethodDescribe("getPvDeviceExList");
List<DeviceRunExBO> pvDeviceExList = pvDeviceRunExService.getPvDeviceExList(deviceRunExDTO);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pvDeviceExList, methodDescribe);
}
}

5
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDispatchController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java
View File

@@ -1,12 +1,11 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
/** /**
* <p> * <p>

15
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvDistributedController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,11 +8,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.PvDistributedParam; import com.njcn.device.pms.pojo.param.DistributedQueryParam;
import com.njcn.device.pojo.param.pv.DistributedQueryParam; import com.njcn.device.pms.pojo.param.PvDistributedParam;
import com.njcn.device.pojo.po.pv.PvDistributed; import com.njcn.device.pms.pojo.po.PvDistributed;
import com.njcn.device.pojo.vo.pv.PvDistributedVO; import com.njcn.device.pms.pojo.vo.PvDistributedVO;
import com.njcn.pvdevice.service.IPvDistributedService; import com.njcn.device.pms.service.IPvDistributedService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

13
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLineDetailController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,10 +8,11 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.LineDetailQueryParam; import com.njcn.device.pms.pojo.param.LineDetailQueryParam;
import com.njcn.device.pojo.param.pv.PvLineDetailParam; import com.njcn.device.pms.pojo.param.PvLineDetailParam;
import com.njcn.device.pojo.po.pv.PvLineDetail; import com.njcn.device.pms.pojo.po.PvLineDetail;
import com.njcn.pvdevice.service.IPvLineDetailService; import com.njcn.device.pms.service.IPvLineDetailService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -19,8 +20,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

15
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvLvUserController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,11 +8,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.LvUserQueryParam; import com.njcn.device.pms.pojo.param.LvUserQueryParam;
import com.njcn.device.pojo.param.pv.PvLvUserParam; import com.njcn.device.pms.pojo.param.PvLvUserParam;
import com.njcn.device.pojo.po.pv.PvLvUser; import com.njcn.device.pms.pojo.po.PvLvUser;
import com.njcn.device.pojo.vo.pv.PvLvUserVO; import com.njcn.device.pms.pojo.vo.PvLvUserVO;
import com.njcn.pvdevice.service.IPvLvUserService; import com.njcn.device.pms.service.IPvLvUserService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

16
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubAreaController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,12 +8,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.PvSubAreaParam; import com.njcn.device.pms.pojo.param.PvSubAreaParam;
import com.njcn.device.pojo.param.pv.SubAreaQueryParam; import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
import com.njcn.device.pojo.po.pv.PvSubArea; import com.njcn.device.pms.pojo.po.PvSubArea;
import com.njcn.device.pojo.vo.pv.PvSubAreaVO; import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
import com.njcn.pvdevice.service.IPvSubAreaService; import com.njcn.device.pms.service.IPvSubAreaService;
import com.sun.el.parser.BooleanNode; import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -21,8 +21,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;

16
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvSubstationController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,12 +8,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.PvSubstationParam; import com.njcn.device.pms.pojo.param.PvSubstationParam;
import com.njcn.device.pojo.param.pv.SubstationQueryParam; import com.njcn.device.pms.pojo.param.SubstationQueryParam;
import com.njcn.device.pojo.po.pv.PvSubstation; import com.njcn.device.pms.pojo.po.PvSubstation;
import com.njcn.device.pojo.vo.pv.PvSubstationVO; import com.njcn.device.pms.pojo.vo.PvSubstationVO;
import com.njcn.pvdevice.service.IPvSubstationService; import com.njcn.device.pms.service.IPvSubstationService;
import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -21,8 +21,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
/** /**

15
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTenVoltageController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,11 +8,12 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.PvTenVoltageParam; import com.njcn.device.pms.pojo.param.PvTenVoltageParam;
import com.njcn.device.pojo.param.pv.TenVoltageQueryParam; import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
import com.njcn.device.pojo.po.pv.PvTenVoltage; import com.njcn.device.pms.pojo.po.PvTenVoltage;
import com.njcn.device.pojo.vo.pv.PvTenVoltageVO; import com.njcn.device.pms.pojo.vo.PvTenVoltageVO;
import com.njcn.pvdevice.service.IPvTenVoltageService; import com.njcn.device.pms.service.IPvTenVoltageService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
/** /**

10
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvTerminalBaseController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.annotation.OperateInfo;
@@ -6,10 +6,10 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.PvTerminalBaseQuery; import com.njcn.device.pms.pojo.param.PvTerminalBaseQuery;
import com.njcn.device.pojo.vo.pv.DisOrLvVO; import com.njcn.device.pms.pojo.vo.DisOrLvVO;
import com.njcn.device.pojo.vo.pv.PvLineAllDetailVO; import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
import com.njcn.pvdevice.service.PvTerminalBaseService; import com.njcn.device.pms.service.PvTerminalBaseService;
import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.user.pojo.vo.PvTerminalTreeVO;
import com.njcn.web.controller.BaseController; import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;

27
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvUnitController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java
View File

@@ -1,27 +1,12 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.device.pms.service.IPvUnitService;
import com.njcn.common.pojo.constant.OperateType;
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.device.pojo.param.pv.PvUnitParam;
import com.njcn.device.pojo.po.pv.PvUnit;
import com.njcn.device.pojo.vo.pv.UnitTreeVO;
import com.njcn.pvdevice.service.IPvUnitService;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController; import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import java.util.List; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/** /**
* <p> * <p>

15
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/controller/PvVoltageController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java
View File

@@ -1,4 +1,4 @@
package com.njcn.pvdevice.controller; package com.njcn.device.pms.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,12 +8,11 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pojo.param.pv.PvVoltageParam; import com.njcn.device.pms.pojo.param.PvVoltageParam;
import com.njcn.device.pojo.param.pv.VoltageQueryParam; import com.njcn.device.pms.pojo.param.VoltageQueryParam;
import com.njcn.device.pojo.po.pv.PvVoltage; import com.njcn.device.pms.pojo.po.PvVoltage;
import com.njcn.pvdevice.service.IPvTenVoltageService; import com.njcn.device.pms.service.IPvVoltageService;
import com.njcn.pvdevice.service.IPvVoltageService; import com.njcn.web.controller.BaseController;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -21,8 +20,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
/** /**

8
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDeviceMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java
View File

@@ -1,10 +1,10 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.DeviceQueryParam; import com.njcn.device.pms.pojo.param.DeviceQueryParam;
import com.njcn.device.pojo.po.pv.PvDevice; import com.njcn.device.pms.pojo.po.PvDevice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pojo.vo.pv.PvDeviceVO; import com.njcn.device.pms.pojo.vo.PvDeviceVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

22
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java Normal file
View File

@@ -0,0 +1,22 @@
package com.njcn.device.pms.mapper;
import com.njcn.device.pms.pojo.bo.DeviceRunExBO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author yangj
* @date 2022/09/14
*/
public interface PvDeviceRunExMapper {
/**
* 查询pq_line表获取信息
* @param lineLevel 监测点等级
* @param pid 父级id
* @return List<DeviceRunExBO>
*/
List<DeviceRunExBO> findPQLineInfo(@Param("lineLevel") String lineLevel, @Param("pid") String pid);
}

4
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDispatchMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java
View File

@@ -1,6 +1,6 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.njcn.device.pojo.po.pv.PvDispatch; import com.njcn.device.pms.pojo.po.PvDispatch;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

8
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvDistributedMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java
View File

@@ -1,11 +1,11 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.DistributedQueryParam; import com.njcn.device.pms.pojo.param.DistributedQueryParam;
import com.njcn.device.pojo.po.pv.PvDistributed; import com.njcn.device.pms.pojo.po.PvDistributed;
import com.njcn.device.pojo.vo.pv.PvDistributedVO; import com.njcn.device.pms.pojo.vo.PvDistributedVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**

6
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLineDetailMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java
View File

@@ -1,9 +1,9 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.po.pv.PvLineDetail; import com.njcn.device.pms.pojo.po.PvLineDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pojo.vo.pv.PvLineAllDetailVO; import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

8
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvLvUserMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java
View File

@@ -1,10 +1,10 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.LvUserQueryParam; import com.njcn.device.pms.pojo.param.LvUserQueryParam;
import com.njcn.device.pojo.po.pv.PvLvUser; import com.njcn.device.pms.pojo.po.PvLvUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pojo.vo.pv.PvLvUserVO; import com.njcn.device.pms.pojo.vo.PvLvUserVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**

10
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubAreaMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java
View File

@@ -1,11 +1,11 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.SubAreaQueryParam; import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
import com.njcn.device.pojo.po.pv.PvSubArea; import com.njcn.device.pms.pojo.po.PvSubArea;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pojo.vo.pv.DisOrLvVO; import com.njcn.device.pms.pojo.vo.DisOrLvVO;
import com.njcn.device.pojo.vo.pv.PvSubAreaVO; import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.user.pojo.vo.PvTerminalTreeVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

8
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvSubstationMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java
View File

@@ -1,10 +1,10 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.SubstationQueryParam; import com.njcn.device.pms.pojo.param.SubstationQueryParam;
import com.njcn.device.pojo.po.pv.PvSubstation; import com.njcn.device.pms.pojo.po.PvSubstation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pojo.vo.pv.PvSubstationVO; import com.njcn.device.pms.pojo.vo.PvSubstationVO;
import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.user.pojo.vo.PvTerminalTreeVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

8
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvTenVoltageMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java
View File

@@ -1,10 +1,10 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.TenVoltageQueryParam; import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
import com.njcn.device.pojo.po.pv.PvTenVoltage; import com.njcn.device.pms.pojo.po.PvTenVoltage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pojo.vo.pv.PvTenVoltageVO; import com.njcn.device.pms.pojo.vo.PvTenVoltageVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**

6
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvUnitMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java
View File

@@ -1,8 +1,8 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.njcn.device.pojo.po.pv.PvUnit; import com.njcn.device.pms.pojo.po.PvUnit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pojo.vo.pv.UnitTreeVO; import com.njcn.device.pms.pojo.vo.UnitTreeVO;
import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.user.pojo.vo.PvTerminalTreeVO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/PvVoltageMapper.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java
View File

@@ -1,6 +1,6 @@
package com.njcn.pvdevice.mapper; package com.njcn.device.pms.mapper;
import com.njcn.device.pojo.po.pv.PvVoltage; import com.njcn.device.pms.pojo.po.PvVoltage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDeviceMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvDeviceMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvDeviceMapper">
<select id="getPvDeviceList" resultType="PvDeviceVO"> <select id="getPvDeviceList" resultType="PvDeviceVO">
SELECT SELECT

32
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceRunExMapper.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.pms.mapper.PvDeviceRunExMapper">
<resultMap id="findPQLine" type="com.njcn.device.pms.pojo.bo.DeviceRunExBO">
<id column="Id" property="id"/>
<result column="Pid" property="pid"/>
<result column="Pids" property="pidS"/>
<result column="Name" property="name"/>
<result column="Level" property="level"/>
<result column="Sort" property="sort"/>
<result column="Remark" property="remark"/>
<result column="State" property="state"/>
<result column="Create_By" property="createBy"/>
<result column="Create_Time" property="createTime"/>
<result column="Update_By" property="updateBy"/>
<result column="Update_Time" property="updateTime"/>
<collection property="children" column="id" ofType="com.njcn.device.pms.pojo.bo.DeviceRunExBO"/>
</resultMap>
<select id="findPQLineInfo" resultMap="findPQLine">
select
t1.*
from pq_line t1
left join pq_line_detail t2
on t1.Id = t2.Id
where pid = #{pid}
and t2.Line_Grade = #{lineLevel}
and State = 1
</select>
</mapper>

2
pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/StrategydicFunMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.mapper.StrategydicFunMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvDispatchMapper">
</mapper> </mapper>

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvDistributedMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvDistributedMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvDistributedMapper">
<select id="getPvDistributedList" resultType="PvDistributedVO"> <select id="getPvDistributedList" resultType="PvDistributedVO">
SELECT SELECT

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvLineDetailMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLineDetailMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvLineDetailMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvLineDetailMapper">
<select id="getPvLineAllDetailMain" resultType="PvLineAllDetailVO"> <select id="getPvLineAllDetailMain" resultType="PvLineAllDetailVO">

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvLvUserMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvLvUserMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvLvUserMapper">
<select id="getPvLvUserList" resultType="PvLvUserVO"> <select id="getPvLvUserList" resultType="PvLvUserVO">
SELECT SELECT

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvSubAreaMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubAreaMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvSubAreaMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvSubAreaMapper">
<select id="getPvSubAreaList" resultType="PvSubAreaVO"> <select id="getPvSubAreaList" resultType="PvSubAreaVO">
SELECT SELECT

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvSubstationMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvSubstationMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvSubstationMapper">
<select id="getPvSubstationList" resultType="PvSubstationVO"> <select id="getPvSubstationList" resultType="PvSubstationVO">
SELECT SELECT

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvTenVoltageMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvTenVoltageMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvTenVoltageMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvTenVoltageMapper">
<select id="getPvTenVoltageList" resultType="PvTenVoltageVO"> <select id="getPvTenVoltageList" resultType="PvTenVoltageVO">
SELECT SELECT

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvUnitMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvUnitMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvUnitMapper">
<select id="getPvUnitList" resultType="UnitTreeVO"> <select id="getPvUnitList" resultType="UnitTreeVO">

2
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/mapper/mapping/PvVoltageMapper.xml → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvVoltageMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.pvdevice.mapper.PvVoltageMapper"> <mapper namespace="com.njcn.device.pms.mapper.PvVoltageMapper">
</mapper> </mapper>

24
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceRunExService.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.device.pms.service;
import com.njcn.device.pms.pojo.bo.DeviceRunExBO;
import com.njcn.device.pms.pojo.dto.DeviceRunExDTO;
import java.util.List;
/**
* 终端异常服务类
*
* @author yangj
* @date 2022/09/08
*/
public interface IPvDeviceRunExService {
/**
* 分页条件查询终端异常列表信息
* @param deviceRunExDTO 终端条件查询dto
* @return List<DeviceRunExBO>
*/
List<DeviceRunExBO> getPvDeviceExList(DeviceRunExDTO deviceRunExDTO);
}

11
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/service/IPvDeviceService.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceService.java
View File

@@ -1,12 +1,11 @@
package com.njcn.pvdevice.service; package com.njcn.device.pms.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.DeviceQueryParam;
import com.njcn.device.pojo.param.pv.PvDeviceParam;
import com.njcn.device.pojo.po.pv.PvDevice;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pojo.po.pv.PvDevice; import com.njcn.device.pms.pojo.param.DeviceQueryParam;
import com.njcn.device.pojo.vo.pv.PvDeviceVO; import com.njcn.device.pms.pojo.param.PvDeviceParam;
import com.njcn.device.pms.pojo.po.PvDevice;
import com.njcn.device.pms.pojo.vo.PvDeviceVO;
import java.util.List; import java.util.List;

4
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/service/IPvDispatchService.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDispatchService.java
View File

@@ -1,7 +1,7 @@
package com.njcn.pvdevice.service; package com.njcn.device.pms.service;
import com.njcn.device.pojo.po.pv.PvDispatch;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pms.pojo.po.PvDispatch;
/** /**
* <p> * <p>

11
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/service/IPvDistributedService.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDistributedService.java
View File

@@ -1,13 +1,12 @@
package com.njcn.pvdevice.service; package com.njcn.device.pms.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pojo.param.pv.PvDistributedParam; import com.njcn.device.pms.pojo.param.DistributedQueryParam;
import com.njcn.device.pojo.param.pv.DistributedQueryParam; import com.njcn.device.pms.pojo.param.PvDistributedParam;
import com.njcn.device.pojo.po.pv.PvDistributed; import com.njcn.device.pms.pojo.po.PvDistributed;
import com.njcn.device.pojo.po.pv.PvDistributed; import com.njcn.device.pms.pojo.vo.PvDistributedVO;
import com.njcn.device.pojo.vo.pv.PvDistributedVO;
import java.util.List; import java.util.List;

11
pqs-device/device-boot/src/main/java/com/njcn/pvdevice/service/IPvLineDetailService.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLineDetailService.java
View File

@@ -1,12 +1,11 @@
package com.njcn.pvdevice.service; package com.njcn.device.pms.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pojo.param.pv.LineDetailQueryParam;
import com.njcn.device.pojo.param.pv.PvLineDetailParam;
import com.njcn.device.pojo.po.pv.PvLineDetail;
import com.njcn.device.pojo.po.pv.PvLineDetail;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pojo.vo.pv.PvLineAllDetailVO; import com.njcn.device.pms.pojo.param.LineDetailQueryParam;
import com.njcn.device.pms.pojo.param.PvLineDetailParam;
import com.njcn.device.pms.pojo.po.PvLineDetail;
import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
import java.util.List; import java.util.List;

Some files were not shown because too many files have changed in this diff Show More