From 7e666daa7af93cf13f51a0ed5040742ab35e7391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 13 Jun 2023 13:39:46 +0800
Subject: [PATCH] =?UTF-8?q?pms=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../param/PowerDistributionareaParam.java | 4 +
.../pms/pojo/po/PowerDistributionarea.java | 9 +
.../ledgerManger/PmsMonitorController.java | 13 +-
.../mapper/majornetwork/LineBakMapper.java | 19 +
.../majornetwork/PmsGeneratrixMapper.java | 47 --
.../service/majornetwork/IMonitorService.java | 3 +-
.../majornetwork/impl/MonitorServiceImpl.java | 447 ++++++++++++++++--
.../pq/pojo/bo/excel/OracleTerminalExcel.java | 2 +-
.../com/njcn/system/enums/DicDataEnum.java | 9 +
.../njcn/system/enums/DicDataTypeEnum.java | 2 +-
10 files changed, 459 insertions(+), 96 deletions(-)
create mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/LineBakMapper.java
delete mode 100644 pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
index 78d8744a8..246e5935e 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
@@ -64,6 +64,10 @@ public class PowerDistributionareaParam {
@NotBlank(message = "地区特征不可为空")
private String regionalism;
+ @ApiModelProperty(name = "regionalism", value = "设备地区特征")
+ @NotBlank(message = "设备地区特征不可为空")
+ private String devRegionalism;
+
@ApiModelProperty(name = "ifRuralPowerGrid", value = "是否农网:0-否;1:是")
@NotNull(message = "是否农网不可为空")
private Integer ifRuralPowerGrid;
diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
index 7c3bfafdc..1a8d7e07f 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
@@ -2,9 +2,12 @@ package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotBlank;
+
/**
*
*
@@ -86,6 +89,12 @@ public class PowerDistributionarea extends BaseEntity {
*/
private String regionalism;
+
+ /**
+ * 设备地区特征(字典)
+ */
+ private String devRegionalism;
+
/**
* 是否农网:0-否;1:是;
*/
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java
index 308ad2fd3..f4021ed48 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java
@@ -289,11 +289,14 @@ public class PmsMonitorController extends BaseController {
* @date 2023/6/8
*/
@PostMapping("/importOracleLedgerToMysql")
- @ApiOperation("获取台账和终端信息(波形专用)")
- @ApiImplicitParam(name = "param", value = "主网监测点实体", required = true)
- public void importOracleLedgerToMysql(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
+ @ApiOperation("oracle系统监测点转mysql主网监测点")
+ public HttpResult