Merge remote-tracking branch 'origin/master'

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<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"),

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

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
         </if>
         <!--母线-->
         <if test="type == 2">