diff --git a/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java b/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java index f6b011a..20396ce 100644 --- a/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java +++ b/src/main/java/com/njcn/jbsyncdata/controller/DisPhotovoltaicController.java @@ -104,13 +104,13 @@ public class DisPhotovoltaicController { } -// @ApiOperation(value = "将用户数据导入到配网表中") -// @PostMapping("/insertDistributionMonitor") -// public String import380KV() throws Exception { -// Boolean aBoolean = disPhotovoltaicService.savePmsDistributionMonitor(); -// if(aBoolean){ -// return "数据导入成功"; -// } -// return "数据导入失败"; -// } + @ApiOperation(value = "将用户数据导入到配网表中") + @PostMapping("/insertDistributionMonitor") + public String import380KV() throws Exception { + Boolean aBoolean = disPhotovoltaicService.savePmsDistributionMonitor(); + if(aBoolean){ + return "数据导入成功"; + } + return "数据导入失败"; + } } diff --git a/src/main/java/com/njcn/jbsyncdata/mapper/mapping/DictDataMapper.xml b/src/main/java/com/njcn/jbsyncdata/mapper/mapping/DictDataMapper.xml index 10e4a67..d94f124 100644 --- a/src/main/java/com/njcn/jbsyncdata/mapper/mapping/DictDataMapper.xml +++ b/src/main/java/com/njcn/jbsyncdata/mapper/mapping/DictDataMapper.xml @@ -13,7 +13,10 @@ Created_Date, Status, Create_Time, - Update_Time + Update_Time, + Line_Id, + Statistical_Interval, + Power_Station_Id ) select (select id from sys_dict_data where code="Three_Line") as Monitor_Sort, @@ -25,7 +28,10 @@ now() as Created_Date, 1 as Status, now() as Create_Time, - now() as Update_Time + now() as Update_Time, + Line_Id as Statistical_Interval, + 15 as Statistical_Interval, + Power_Station_Id as Power_Station_Id from pms_power_generation_user where Status=1