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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangbaojian
2023-05-29 13:36:59 +08:00
parent 4a8e540f61 9dbced164e
commit c11f60bb06
7 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@@ -42,20 +42,14 @@
<!--中间件目标地址-->
<middle.server.url>192.168.1.13</middle.server.url>
<!--微服务模块发布地址-->
<service.server.url>192.168.1.111</service.server.url>
<service.server.url>192.168.1.139</service.server.url>
<!--docker仓库地址-->
<docker.server.url>192.168.1.31</docker.server.url>
<docker.server.url>192.168.1.13</docker.server.url>
<!--nacos的ip:port-->
<nacos.url>${middle.server.url}:18848</nacos.url>
<!--服务器发布内容为空-->
<nacos.namespace></nacos.namespace>
<!-- <nacos.namespace>fd74182b-1fce-4dba-afa7-2623b0376205</nacos.namespace>-->
<!-- 13-->
<!-- <nacos.namespace>2974723d-4032-4d63-a0fa-80921894b9c3</nacos.namespace>-->
<!--<nacos.namespace></nacos.namespace>-->
<nacos.namespace>415a1c87-33aa-47bd-8e25-13cc456c87ed</nacos.namespace>
<!--sentinel:port-->
<sentinel.url>${middle.server.url}:8080</sentinel.url>
<!--网关地址，主要用于配置swagger中认证token-->

25
pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java
View File

@@ -19,9 +19,9 @@ import java.util.stream.Stream;
*/
public class GenerateCode {
private static final String TARGET_DIR = "D://code";
private static final String TARGET_DIR = "C://code";
private static final String DB_URL = "jdbc:mysql://192.168.1.18:13306/pqsinfo_pms";
private static final String DB_URL = "jdbc:mysql://192.168.1.18:13306/pqsinfo_test";
private static final String USERNAME = "root";
@@ -30,24 +30,9 @@ public class GenerateCode {
public static void main(String[] args) {
List<Module> modules = Stream.of(
new Module("hongawen", "com.njcn.device", "pms", Stream.of(
"pms_monitor"
,"pms_distribution_monitor"
,"pms_harmonic_general_management"
,"pms_harmonic_general_management_data"
,"pms_power_client"
,"pms_power_distributionarea"
,"pms_power_generation_user"
,"pms_power_quality_matter"
,"pms_source_management"
,"pms_statation_stat"
,"pms_statistics_run_monitor"
,"pms_terminal"
,"pms_terminal_eliminate_data"
,"pms_traction_station"
,"pms_transient_stastic_data"
,"pms_treat_transient_detail_data"
).collect(Collectors.toList()), "pms_")
new Module("xuyang", "com.njcn.access", "zl", Stream.of(
"ele_epd_pqd"
).collect(Collectors.toList()), "")
).collect(Collectors.toList());
generateJavaFile(modules);
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java
View File

@@ -82,7 +82,7 @@ public class SubstationExpendController extends BaseController {
@PostMapping("/insert")
@ApiOperation("变电站信息")
@ApiImplicitParam(name = "insert", value = "变电站信息", required = true)
public HttpResult<Boolean> insert(@RequestBody StatisticsBizBaseParam param) {
public HttpResult<Boolean> insert(@RequestBody StatisticsBizBaseParam insert) {
String methodDescribe = getMethodDescribe("insert");
List<SubstationExpend> list = Arrays.asList(
new SubstationExpend("500kV天马变电站", "1fa650685c77db1656c70f9db4a2edc6",new BigDecimal(119.292327),new BigDecimal(40.215015),"17439407bfee299b7e38f2e54a8f6d28"),

1
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
View File

@@ -130,6 +130,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
lineDevGetDTO.setInterval(it.getStatisticalInterval());
lineDevGetDTO.setDevId(it.getTerminalId());
lineDevGetDTO.setType(1);
lineDevGetDTO.setLineType(1);
lineDevGetDTO.setVoltageLevel(mapVoltage.get(it.getVoltageLevel()).getValue());
lineList.add(lineDevGetDTO);
});

3
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
View File

@@ -27,7 +27,8 @@
lineDetail.Time_Interval as `interval`,
dic.value voltageLevel,
dev.id devId,
device.com_flag comFlag
device.com_flag comFlag,
1 as lineType
</if>
<!--母线-->
<if test="type == 2">

16
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
View File

@@ -327,6 +327,22 @@ public enum DicDataEnum {
GATEWAY_DEV("网关", "Gateway_Dev"),
CONNECT_DEV("直连设备", "Connect_Dev"),
/**
* 治理数据模型
*/
EPD("电能数据","Epd"),
PQD("电能质量数据","Pqd"),
BMD("基础测量数据","Bmd"),
EVT("事件","Evt"),
ALM("告警","Alm"),
STS("状态","Sts"),
DI("开入","Di"),
DO("电能数据","Do"),
PARM("参数","Parm"),
SET("定值","Set"),
INSET("内部定值","InSet"),
CTRL("控制","Ctrl"),
/**
* 暂降类型
*/

1
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
View File

@@ -74,6 +74,7 @@ public enum DicDataTypeEnum {
ALARM_LEVEL("警告级别","Alarm_Level"),
CS_DATA_TYPE("治理数据模型", "Cs_Data_Type"),
;