diff --git a/pom.xml b/pom.xml index faff48e62..6a2ca96d8 100644 --- a/pom.xml +++ b/pom.xml @@ -42,20 +42,14 @@ 192.168.1.13 - 192.168.1.111 + 192.168.1.139 - 192.168.1.31 + 192.168.1.13 ${middle.server.url}:18848 - - - - - - - - + + 415a1c87-33aa-47bd-8e25-13cc456c87ed ${middle.server.url}:8080 diff --git a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java index ba5f99965..ba1f6dc01 100644 --- a/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java +++ b/pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java @@ -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 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); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java index c4192a4f1..f467ce8dc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java @@ -82,7 +82,7 @@ public class SubstationExpendController extends BaseController { @PostMapping("/insert") @ApiOperation("变电站信息") @ApiImplicitParam(name = "insert", value = "变电站信息", required = true) - public HttpResult insert(@RequestBody StatisticsBizBaseParam param) { + public HttpResult insert(@RequestBody StatisticsBizBaseParam insert) { String methodDescribe = getMethodDescribe("insert"); List list = Arrays.asList( new SubstationExpend("500kV天马变电站", "1fa650685c77db1656c70f9db4a2edc6",new BigDecimal(119.292327),new BigDecimal(40.215015),"17439407bfee299b7e38f2e54a8f6d28"), diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 9d8fb40fa..ba5ed1fa3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -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); }); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml index f9a6f794c..c7e80b589 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml @@ -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 diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index c2ca77aee..26dc710ca 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -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"), + /** * 暂降类型 */ diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java index 0ee6c1ccd..d40fac585 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java @@ -74,6 +74,7 @@ public enum DicDataTypeEnum { ALARM_LEVEL("警告级别","Alarm_Level"), + CS_DATA_TYPE("治理数据模型", "Cs_Data_Type"), ;