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

pom.xml

@@ -40,21 +40,21 @@
         <!--中间件目标地址-->
         <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.url>${middle.server.url}:18848</nacos.url>
         <!--服务器发布内容为空-->
         <!--        <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.url>192.168.1.14:8080</sentinel.url>-->
         <sentinel.url>${middle.server.url}:8080</sentinel.url>
         <!--网关地址，主要用于配置swagger中认证token-->
         <gateway.url>${service.server.url}:10215</gateway.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.repostory>${middle.server.url}:8090</docker.repostory>
+        <docker.repostory>192.168.1.13:8090</docker.repostory>
         <!--docker远程项目仓库名-->
         <docker.registry.name>njcn</docker.registry.name>
         <docker.operate>deploy</docker.operate>
@@ -268,6 +268,11 @@
                 <artifactId>jackson-annotations</artifactId>
                 <version>${jackson}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson}</version>
+            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>

pqs-advance/advance-boot/pom.xml

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

pqs-common/common-core/pom.xml

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

pqs-common/common-influxdb/pom.xml

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

pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/config/InfluxDbOkHttpClientBuilderProvider.java

@@ -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);
+//    }
+//}

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

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

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

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

pqs-common/common-influxdb/src/test/java/DataTest.java

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

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

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

pqs-device/common-device-biz/pom.xml

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

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/LineFlagEnum.java

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

pqs-device/device-boot/pom.xml

@@ -21,44 +21,22 @@
     <dependencies>
         <dependency>
             <groupId>com.njcn</groupId>
-            <artifactId>device-api</artifactId>
+            <artifactId>pq-device-boot</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>
+            <artifactId>pms-device-boot</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>common-swagger</artifactId>
             <version>${project.version}</version>
         </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>
 
     <build>

pqs-device/device-boot/src/main/java/com/njcn/DeviceBootApplication.java

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

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

@@ -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>

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

@@ -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>

pqs-device/device-boot/src/main/resources/bootstrap.yml

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

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

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

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

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

pqs-device/pms-device/pms-device-api/pom.xml

@@ -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>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/bo/DeviceRunExBO.java

@@ -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;
+
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/DeviceRunExDTO.java

@@ -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;
+
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DeviceQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/DistributedQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LineDetailQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/LvUserQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDeviceParam.java

@@ -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.njcn.common.pojo.constant.PatternRegex;
-import com.njcn.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDispatchParam.java

@@ -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.njcn.db.bo.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvDistributedParam.java

@@ -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.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLineDetailParam.java

@@ -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.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvLvUserParam.java

@@ -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.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubAreaParam.java

@@ -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.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvSubstationParam.java

@@ -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.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModelProperty;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTenVoltageParam.java

@@ -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.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +10,6 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvTerminalBaseQuery.java

@@ -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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * pqs

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvUnitParam.java

@@ -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.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PvVoltageParam.java

@@ -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.db.bo.BaseEntity;
 import com.njcn.web.constant.ValidMessage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotBlank;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubAreaQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/SubstationQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TenVoltageQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/VoltageQueryParam.java

@@ -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 io.swagger.annotations.ApiModelProperty;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDevice.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDate;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDispatch.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvDistributed.java

@@ -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.fasterxml.jackson.annotation.JsonFormat;
 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.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDate;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLineDetail.java

@@ -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.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.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDate;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvLvUser.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubArea.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvSubstation.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvTenVoltage.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvUnit.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PvVoltage.java

@@ -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.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DeviceRunExVO.java

@@ -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;
+
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/DisOrLvVO.java

@@ -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 lombok.Data;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDeviceVO.java

@@ -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.EqualsAndHashCode;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvDistributedVO.java

@@ -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.EqualsAndHashCode;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLineAllDetailVO.java

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

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvLvUserVO.java

@@ -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.EqualsAndHashCode;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubAreaVO.java

@@ -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 lombok.Data;
 import lombok.EqualsAndHashCode;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvSubstationVO.java

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

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PvTenVoltageVO.java

@@ -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.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
-import com.njcn.device.pojo.po.pv.PvTenVoltage;
-import io.swagger.annotations.Api;
+import com.njcn.device.pms.pojo.po.PvTenVoltage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/UnitTreeVO.java

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

pqs-device/pms-device/pms-device-boot/pom.xml

@@ -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>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-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.njcn.device.pojo.vo.pv.PvDeviceVO;
-import com.njcn.pvdevice.service.IPvDeviceService;
+import com.njcn.device.pms.pojo.param.DeviceQueryParam;
+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 com.njcn.device.pms.service.IPvDeviceService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 import java.util.Objects;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDeviceRunExController.java

@@ -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);
+    }
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDispatchController.java

@@ -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 lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
-import com.njcn.web.controller.BaseController;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvDistributedController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.pv.PvDistributedParam;
-import com.njcn.device.pojo.param.pv.DistributedQueryParam;
-import com.njcn.device.pojo.po.pv.PvDistributed;
-import com.njcn.device.pojo.vo.pv.PvDistributedVO;
-import com.njcn.pvdevice.service.IPvDistributedService;
+import com.njcn.device.pms.pojo.param.DistributedQueryParam;
+import com.njcn.device.pms.pojo.param.PvDistributedParam;
+import com.njcn.device.pms.pojo.po.PvDistributed;
+import com.njcn.device.pms.pojo.vo.PvDistributedVO;
+import com.njcn.device.pms.service.IPvDistributedService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 import java.util.Objects;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLineDetailController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-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.pvdevice.service.IPvLineDetailService;
+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.service.IPvLineDetailService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -19,8 +20,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 import java.util.Objects;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvLvUserController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.pv.LvUserQueryParam;
-import com.njcn.device.pojo.param.pv.PvLvUserParam;
-import com.njcn.device.pojo.po.pv.PvLvUser;
-import com.njcn.device.pojo.vo.pv.PvLvUserVO;
-import com.njcn.pvdevice.service.IPvLvUserService;
+import com.njcn.device.pms.pojo.param.LvUserQueryParam;
+import com.njcn.device.pms.pojo.param.PvLvUserParam;
+import com.njcn.device.pms.pojo.po.PvLvUser;
+import com.njcn.device.pms.pojo.vo.PvLvUserVO;
+import com.njcn.device.pms.service.IPvLvUserService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 import java.util.Objects;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubAreaController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.pv.PvSubAreaParam;
-import com.njcn.device.pojo.param.pv.SubAreaQueryParam;
-import com.njcn.device.pojo.po.pv.PvSubArea;
-import com.njcn.device.pojo.vo.pv.PvSubAreaVO;
-import com.njcn.pvdevice.service.IPvSubAreaService;
-import com.sun.el.parser.BooleanNode;
+import com.njcn.device.pms.pojo.param.PvSubAreaParam;
+import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
+import com.njcn.device.pms.pojo.po.PvSubArea;
+import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
+import com.njcn.device.pms.service.IPvSubAreaService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -21,8 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 import java.util.Objects;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvSubstationController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.pv.PvSubstationParam;
-import com.njcn.device.pojo.param.pv.SubstationQueryParam;
-import com.njcn.device.pojo.po.pv.PvSubstation;
-import com.njcn.device.pojo.vo.pv.PvSubstationVO;
-import com.njcn.pvdevice.service.IPvSubstationService;
-import com.njcn.web.pojo.param.BaseParam;
+import com.njcn.device.pms.pojo.param.PvSubstationParam;
+import com.njcn.device.pms.pojo.param.SubstationQueryParam;
+import com.njcn.device.pms.pojo.po.PvSubstation;
+import com.njcn.device.pms.pojo.vo.PvSubstationVO;
+import com.njcn.device.pms.service.IPvSubstationService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -21,8 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTenVoltageController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.pv.PvTenVoltageParam;
-import com.njcn.device.pojo.param.pv.TenVoltageQueryParam;
-import com.njcn.device.pojo.po.pv.PvTenVoltage;
-import com.njcn.device.pojo.vo.pv.PvTenVoltageVO;
-import com.njcn.pvdevice.service.IPvTenVoltageService;
+import com.njcn.device.pms.pojo.param.PvTenVoltageParam;
+import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
+import com.njcn.device.pms.pojo.po.PvTenVoltage;
+import com.njcn.device.pms.pojo.vo.PvTenVoltageVO;
+import com.njcn.device.pms.service.IPvTenVoltageService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvTerminalBaseController.java

@@ -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.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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.pv.PvTerminalBaseQuery;
-import com.njcn.device.pojo.vo.pv.DisOrLvVO;
-import com.njcn.device.pojo.vo.pv.PvLineAllDetailVO;
-import com.njcn.pvdevice.service.PvTerminalBaseService;
+import com.njcn.device.pms.pojo.param.PvTerminalBaseQuery;
+import com.njcn.device.pms.pojo.vo.DisOrLvVO;
+import com.njcn.device.pms.pojo.vo.PvLineAllDetailVO;
+import com.njcn.device.pms.service.PvTerminalBaseService;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvUnitController.java

@@ -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.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.device.pms.service.IPvUnitService;
 import com.njcn.web.controller.BaseController;
-
-import java.util.List;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/PvVoltageController.java

@@ -1,4 +1,4 @@
-package com.njcn.pvdevice.controller;
+package com.njcn.device.pms.controller;
 
 
 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.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.pv.PvVoltageParam;
-import com.njcn.device.pojo.param.pv.VoltageQueryParam;
-import com.njcn.device.pojo.po.pv.PvVoltage;
-import com.njcn.pvdevice.service.IPvTenVoltageService;
-import com.njcn.pvdevice.service.IPvVoltageService;
-import com.njcn.web.pojo.param.BaseParam;
+import com.njcn.device.pms.pojo.param.PvVoltageParam;
+import com.njcn.device.pms.pojo.param.VoltageQueryParam;
+import com.njcn.device.pms.pojo.po.PvVoltage;
+import com.njcn.device.pms.service.IPvVoltageService;
+import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -21,8 +20,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import com.njcn.web.controller.BaseController;
-
 import java.util.List;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceMapper.java

@@ -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.njcn.device.pojo.param.pv.DeviceQueryParam;
-import com.njcn.device.pojo.po.pv.PvDevice;
+import com.njcn.device.pms.pojo.param.DeviceQueryParam;
+import com.njcn.device.pms.pojo.po.PvDevice;
 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 java.util.List;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDeviceRunExMapper.java

@@ -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);
+
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDispatchMapper.java

@@ -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;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvDistributedMapper.java

@@ -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.extension.plugins.pagination.Page;
-import com.njcn.device.pojo.param.pv.DistributedQueryParam;
-import com.njcn.device.pojo.po.pv.PvDistributed;
-import com.njcn.device.pojo.vo.pv.PvDistributedVO;
+import com.njcn.device.pms.pojo.param.DistributedQueryParam;
+import com.njcn.device.pms.pojo.po.PvDistributed;
+import com.njcn.device.pms.pojo.vo.PvDistributedVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLineDetailMapper.java

@@ -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.njcn.device.pojo.po.pv.PvLineDetail;
+import com.njcn.device.pms.pojo.po.PvLineDetail;
 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 java.util.List;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvLvUserMapper.java

@@ -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.njcn.device.pojo.param.pv.LvUserQueryParam;
-import com.njcn.device.pojo.po.pv.PvLvUser;
+import com.njcn.device.pms.pojo.param.LvUserQueryParam;
+import com.njcn.device.pms.pojo.po.PvLvUser;
 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;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubAreaMapper.java

@@ -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.njcn.device.pojo.param.pv.SubAreaQueryParam;
-import com.njcn.device.pojo.po.pv.PvSubArea;
+import com.njcn.device.pms.pojo.param.SubAreaQueryParam;
+import com.njcn.device.pms.pojo.po.PvSubArea;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.pojo.vo.pv.DisOrLvVO;
-import com.njcn.device.pojo.vo.pv.PvSubAreaVO;
+import com.njcn.device.pms.pojo.vo.DisOrLvVO;
+import com.njcn.device.pms.pojo.vo.PvSubAreaVO;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import org.apache.ibatis.annotations.Param;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvSubstationMapper.java

@@ -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.njcn.device.pojo.param.pv.SubstationQueryParam;
-import com.njcn.device.pojo.po.pv.PvSubstation;
+import com.njcn.device.pms.pojo.param.SubstationQueryParam;
+import com.njcn.device.pms.pojo.po.PvSubstation;
 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 org.apache.ibatis.annotations.Param;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvTenVoltageMapper.java

@@ -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.njcn.device.pojo.param.pv.TenVoltageQueryParam;
-import com.njcn.device.pojo.po.pv.PvTenVoltage;
+import com.njcn.device.pms.pojo.param.TenVoltageQueryParam;
+import com.njcn.device.pms.pojo.po.PvTenVoltage;
 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;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvUnitMapper.java

@@ -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.njcn.device.pojo.vo.pv.UnitTreeVO;
+import com.njcn.device.pms.pojo.vo.UnitTreeVO;
 import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import org.apache.ibatis.annotations.Param;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/PvVoltageMapper.java

@@ -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;
 
 /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvDeviceMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvDeviceMapper">
 
     <select id="getPvDeviceList" resultType="PvDeviceVO">
         SELECT

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDeviceRunExMapper.xml

@@ -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>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDispatchMapper.xml

@@ -1,5 +1,5 @@
 <?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.StrategydicFunMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvDispatchMapper">
 
 </mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvDistributedMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvDistributedMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvDistributedMapper">
 
     <select id="getPvDistributedList" resultType="PvDistributedVO">
         SELECT

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLineDetailMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvLineDetailMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvLineDetailMapper">
 
     <select id="getPvLineAllDetailMain" resultType="PvLineAllDetailVO">
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvLvUserMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvLvUserMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvLvUserMapper">
 
     <select id="getPvLvUserList" resultType="PvLvUserVO">
         SELECT

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubAreaMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvSubAreaMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvSubAreaMapper">
 
     <select id="getPvSubAreaList" resultType="PvSubAreaVO">
         SELECT

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvSubstationMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvSubstationMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvSubstationMapper">
 
     <select id="getPvSubstationList" resultType="PvSubstationVO">
         SELECT

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvTenVoltageMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvTenVoltageMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvTenVoltageMapper">
 
     <select id="getPvTenVoltageList" resultType="PvTenVoltageVO">
         SELECT

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvUnitMapper.xml

@@ -1,6 +1,6 @@
 <?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.PvUnitMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvUnitMapper">
 
 
     <select id="getPvUnitList" resultType="UnitTreeVO">

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/mapping/PvVoltageMapper.xml

@@ -1,5 +1,5 @@
 <?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.PvVoltageMapper">
+<mapper namespace="com.njcn.device.pms.mapper.PvVoltageMapper">
 
 </mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceRunExService.java

@@ -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);
+}

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDeviceService.java

@@ -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.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.njcn.device.pojo.po.pv.PvDevice;
-import com.njcn.device.pojo.vo.pv.PvDeviceVO;
+import com.njcn.device.pms.pojo.param.DeviceQueryParam;
+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;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDispatchService.java

@@ -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.njcn.device.pms.pojo.po.PvDispatch;
 
 /**
  * <p>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvDistributedService.java

@@ -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.service.IService;
-import com.njcn.device.pojo.param.pv.PvDistributedParam;
-import com.njcn.device.pojo.param.pv.DistributedQueryParam;
-import com.njcn.device.pojo.po.pv.PvDistributed;
-import com.njcn.device.pojo.po.pv.PvDistributed;
-import com.njcn.device.pojo.vo.pv.PvDistributedVO;
+import com.njcn.device.pms.pojo.param.DistributedQueryParam;
+import com.njcn.device.pms.pojo.param.PvDistributedParam;
+import com.njcn.device.pms.pojo.po.PvDistributed;
+import com.njcn.device.pms.pojo.vo.PvDistributedVO;
 
 import java.util.List;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/IPvLineDetailService.java

@@ -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.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.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;