1.无锡地图电站打点接口

cn-terminal/src/main/java/com/njcn/product/terminal/device/service/LedgerTreeService.java

@@ -1,10 +0,0 @@
-package com.njcn.product.terminal.device.service;
-
-import com.njcn.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
-
-import java.util.List;
-
-public interface LedgerTreeService {
-
-    List<OracleLedgerTreeDTO> getTree();
-}

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LedgerTreeController.java

@@ -1,12 +1,10 @@
 package com.njcn.product.terminal.mysqlTerminal.controller;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.product.terminal.device.service.LedgerTreeService;
 import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerTreeDTO;
 import com.njcn.product.terminal.mysqlTerminal.pojo.enums.StatisticsEnum;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.DeviceInfoParam;

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LineController.java

@@ -5,7 +5,6 @@ import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
 import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerTreeDTO;
 import com.njcn.product.terminal.mysqlTerminal.service.LineService;
 import com.njcn.web.controller.BaseController;

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/PqStationMapper.java

@@ -0,0 +1,8 @@
+package com.njcn.product.terminal.mysqlTerminal.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
+
+public interface PqStationMapper extends BaseMapper<PqStation> {
+
+}

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/dto/LedgerTreeDTO.java

@@ -1,6 +1,5 @@
 package com.njcn.product.terminal.mysqlTerminal.pojo.dto;
 
-import com.njcn.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
 import lombok.Data;
 
 import java.util.ArrayList;

cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/po/PqStation.java

@@ -0,0 +1,49 @@
+package com.njcn.product.terminal.mysqlTerminal.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author cdf
+ * @since 2022-01-04
+ */
+@Data
+@TableName("pq_substation")
+public class PqStation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变电站序号
+     */
+    private String id;
+
+    /**
+     * 电压等级Id，字典表
+     */
+    private String scale;
+
+    /**
+     * 经度
+     */
+    private BigDecimal lng;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal lat;
+
+
+    @TableField(exist = false)
+    private String name;
+
+
+}

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceDetailMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqDeviceDetail;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDeviceDetail;
 
 /**
  * CN_Gather

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceMapper.java

@@ -1,11 +1,11 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import com.njcn.product.terminal.device.pojo.dto.DeviceDTO;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDeptDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDeptDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqGdCompanyMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqGdCompany;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqGdCompany;
 
 /**
  *

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLineMapper.java

@@ -1,8 +1,8 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLinedetailMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqLinedetail;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLinedetail;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqSubstationMapper.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.njcn.product.terminal.device.pojo.dto.SubstationDTO;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsDeptslineMapper.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.product.terminal.device.pojo.po.PqsDeptsline;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsDeptsline;
 
 /**
  * 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsStationMapMapper.java

@@ -1,8 +1,8 @@
-package com.njcn.product.terminal.device.mapper;
+package com.njcn.product.terminal.oracleDevice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.njcn.product.terminal.device.pojo.po.PqsStationMap;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsStationMap;
 
 /**
  *

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqDeviceMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.product.terminal.device.mapper.PqDeviceMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.device.pojo.po.PqDevice">
+  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice">
     <!--@mbg.generated-->
     <!--@Table PQ_DEVICE-->
     <id column="DEV_INDEX" jdbcType="DECIMAL" property="devIndex" />
@@ -28,7 +28,7 @@
     NODE_INDEX, PORTID, DEVFLAG, DEV_SERIES, DEV_KEY, IP, DEVMODEL, CALLFLAG, DATATYPE
   </sql>
 
-  <select id="queryListByIds" resultType="com.njcn.product.terminal.device.pojo.dto.DeviceDTO">
+  <select id="queryListByIds" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO">
     select
     pq_device.dev_index devId,
     pq_device.name devName,
@@ -52,7 +52,7 @@
     </foreach>
   </select>
 
-  <select id="selectDeviceDTOPage" resultType="com.njcn.product.terminal.device.pojo.dto.DeviceDTO">
+  <select id="selectDeviceDTOPage" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO">
 
     SELECT  DISTINCT
     pq_device.dev_index devId,

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqLineMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.product.terminal.device.mapper.PqLineMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.device.pojo.po.PqLine">
+  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.oracleDevice.pojo.po.PqLine">
     <!--@mbg.generated-->
     <!--@Table PQ_LINE-->
     <id column="LINE_INDEX" jdbcType="DECIMAL" property="lineIndex" />
@@ -29,7 +29,7 @@
   </sql>
 
 
-  <select id="getBaseLineInfo" resultType="com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO">
+  <select id="getBaseLineInfo" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO">
 
       WITH temp AS(
       select PQ_USER_LINE_ASS.LINE_INDEX LINE_INDEX,listagg(PQ_USER_LEDGER.CUSTOMER_NAME,';')  within GROUP (order by PQ_USER_LEDGER.CUSTOMER_NAME) objName from PQ_USER_LINE_ASS  ,PQ_USER_LEDGER where PQ_USER_LINE_ASS.USER_INDEX=PQ_USER_LEDGER.ID group by PQ_USER_LINE_ASS.LINE_INDEX
@@ -62,7 +62,7 @@ where 1=1
   </select>
 
 
-    <select id="getBaseLedger" resultType="com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO">
+    <select id="getBaseLedger" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO">
         select
         PQ_GDINFORMATION.name gdName,
         pq_line.GD_INDEX gdIndex,

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqSubstationMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.product.terminal.device.mapper.PqSubstationMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.device.pojo.po.PqSubstation">
+  <resultMap id="BaseResultMap" type="com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation">
     <!--@mbg.generated-->
     <!--@Table PQ_SUBSTATION-->
     <id column="SUB_INDEX" jdbcType="DECIMAL" property="subIndex" />
@@ -14,7 +14,7 @@
     SUB_INDEX, GD_INDEX, "NAME", "SCALE"
   </sql>
 
-  <select id="queryListByIds" resultType="com.njcn.product.terminal.device.pojo.dto.SubstationDTO">
+  <select id="queryListByIds" resultType="com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO">
     select
     PQ_SUBSTATION.sub_index stationId,
     PQ_SUBSTATION.name stationName,

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDeptDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/LedgerBaseInfoDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/OracleLedgerTreeDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/PqsDeptDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/SubstationDTO.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.dto;
+package com.njcn.product.terminal.oracleDevice.pojo.dto;
 
 import lombok.Data;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDevice.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDeviceDetail.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqGdCompany.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLine.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLinedetail.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 /**
  * @Author: cdf

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqSubstation.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsDeptsline.java

@@ -1,9 +1,8 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsStationMap.java

@@ -1,4 +1,4 @@
-package com.njcn.product.terminal.device.pojo.po;
+package com.njcn.product.terminal.oracleDevice.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/LedgerTreeService.java

@@ -0,0 +1,10 @@
+package com.njcn.product.terminal.oracleDevice.service;
+
+import com.njcn.product.terminal.oracleDevice.pojo.dto.OracleLedgerTreeDTO;
+
+import java.util.List;
+
+public interface LedgerTreeService {
+
+    List<OracleLedgerTreeDTO> getTree();
+}

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqDeviceService.java

@@ -1,11 +1,11 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDeptDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDeptDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
 
 import java.util.List;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqLineService.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqSubstationService.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.dto.SubstationDTO;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
 
 import java.util.List;
 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqsDeptslineService.java

@@ -1,7 +1,7 @@
-package com.njcn.product.terminal.device.service;
+package com.njcn.product.terminal.oracleDevice.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.product.terminal.device.pojo.po.PqsDeptsline;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsDeptsline;
 
 /**
  * 

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/LedgerTreeServiceImpl.java

@@ -1,17 +1,17 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.product.terminal.device.mapper.PqDeviceMapper;
-import com.njcn.product.terminal.device.mapper.PqGdCompanyMapper;
-import com.njcn.product.terminal.device.mapper.PqLineMapper;
-import com.njcn.product.terminal.device.mapper.PqSubstationMapper;
-import com.njcn.product.terminal.device.pojo.dto.OracleLedgerTreeDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
-import com.njcn.product.terminal.device.pojo.po.PqGdCompany;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
-import com.njcn.product.terminal.device.service.LedgerTreeService;
+import com.njcn.product.terminal.oracleDevice.mapper.PqDeviceMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqGdCompanyMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqLineMapper;
+import com.njcn.product.terminal.oracleDevice.mapper.PqSubstationMapper;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.OracleLedgerTreeDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqGdCompany;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.service.LedgerTreeService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqDeviceServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import com.njcn.product.terminal.device.mapper.PqDeviceMapper;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDTO;
-import com.njcn.product.terminal.device.pojo.dto.DeviceDeptDTO;
-import com.njcn.product.terminal.device.pojo.po.PqDevice;
-import com.njcn.product.terminal.device.service.PqDeviceService;
+import com.njcn.product.terminal.oracleDevice.mapper.PqDeviceMapper;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.DeviceDeptDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqDevice;
+import com.njcn.product.terminal.oracleDevice.service.PqDeviceService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqLineServiceImpl.java

@@ -1,12 +1,12 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.product.terminal.device.mapper.PqLineMapper;
-import com.njcn.product.terminal.device.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.product.terminal.device.pojo.po.PqLine;
-import com.njcn.product.terminal.device.service.PqLineService;
+import com.njcn.product.terminal.oracleDevice.mapper.PqLineMapper;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.LedgerBaseInfoDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqLine;
+import com.njcn.product.terminal.oracleDevice.service.PqLineService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqSubstationServiceImpl.java

@@ -1,9 +1,9 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
-import com.njcn.product.terminal.device.mapper.PqSubstationMapper;
-import com.njcn.product.terminal.device.pojo.dto.SubstationDTO;
-import com.njcn.product.terminal.device.pojo.po.PqSubstation;
-import com.njcn.product.terminal.device.service.PqSubstationService;
+import com.njcn.product.terminal.oracleDevice.mapper.PqSubstationMapper;
+import com.njcn.product.terminal.oracleDevice.pojo.dto.SubstationDTO;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqSubstation;
+import com.njcn.product.terminal.oracleDevice.service.PqSubstationService;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqsDeptslineServiceImpl.java

@@ -1,8 +1,8 @@
-package com.njcn.product.terminal.device.service.impl;
+package com.njcn.product.terminal.oracleDevice.service.impl;
 
-import com.njcn.product.terminal.device.mapper.PqsDeptslineMapper;
-import com.njcn.product.terminal.device.pojo.po.PqsDeptsline;
-import com.njcn.product.terminal.device.service.PqsDeptslineService;
+import com.njcn.product.terminal.oracleDevice.mapper.PqsDeptslineMapper;
+import com.njcn.product.terminal.oracleDevice.pojo.po.PqsDeptsline;
+import com.njcn.product.terminal.oracleDevice.service.PqsDeptslineService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;