diff --git a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java
index 9058003..d391e4b 100644
--- a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java
+++ b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java
@@ -10,7 +10,7 @@ import com.njcn.product.diagram.LedgerScale.pojo.dto.EventSourceDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.LedgerScaleDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventDetailVO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventLedgerVO;
-import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerBaseInfo;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
 import com.njcn.product.terminal.mysqlTerminal.pojo.vo.TerminalShowVO;
 import com.njcn.product.diagram.LedgerScale.service.LedgerScaleService;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.LargeScreenCountParam;
@@ -168,4 +168,16 @@ public class LedgerScaleController extends BaseController {
     }
 
 
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/stationMap")
+    @ApiOperation("获取变电站详情")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<List<PqStation>> stationMap(@RequestBody LargeScreenCountParam param) {
+        String methodDescribe = getMethodDescribe("stationMap");
+        List<PqStation> result = ledgerScaleService.stationMap(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+
 }
diff --git a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java
index eb3e5d4..34ed669 100644
--- a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java
+++ b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java
@@ -6,7 +6,7 @@ import com.njcn.product.diagram.LedgerScale.pojo.dto.EventSourceDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.LedgerScaleDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventDetailVO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventLedgerVO;
-import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerBaseInfo;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
 import com.njcn.product.terminal.mysqlTerminal.pojo.vo.TerminalShowVO;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.LargeScreenCountParam;
 
@@ -44,4 +44,6 @@ public interface LedgerScaleService {
 
 
     List<CustomerResponsibility> harmOneImage(String id, Integer time);
+
+    List<PqStation> stationMap(LargeScreenCountParam param);
 }
diff --git a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java
index 59b7bb5..464b12f 100644
--- a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java
+++ b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java
@@ -3,7 +3,6 @@ package com.njcn.product.diagram.LedgerScale.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
@@ -20,24 +19,21 @@ import com.njcn.product.advance.eventSource.pojo.po.RmpEventDetailAssPO;
 import com.njcn.product.advance.harmonicUp.mapper.UpHarmonicDetailMapper;
 import com.njcn.product.advance.harmonicUp.pojo.po.UpHarmonicDetail;
 import com.njcn.product.advance.responsility.mapper.RespDataResultMapper;
-import com.njcn.product.advance.responsility.pojo.dto.CustomerData;
 import com.njcn.product.advance.responsility.pojo.dto.CustomerResponsibility;
-import com.njcn.product.advance.responsility.pojo.dto.ResponsibilityResult;
 import com.njcn.product.advance.responsility.pojo.po.RespDataResult;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.EventSourceDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.dto.LedgerScaleDTO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventDetailVO;
 import com.njcn.product.diagram.LedgerScale.pojo.vo.EventLedgerVO;
-import com.njcn.product.terminal.mysqlTerminal.mapper.LineMapper;
-import com.njcn.product.terminal.mysqlTerminal.mapper.UserReportPOMapper;
-import com.njcn.product.terminal.mysqlTerminal.pojo.po.UserReportPO;
+import com.njcn.product.terminal.mysqlTerminal.mapper.*;
+import com.njcn.product.terminal.mysqlTerminal.pojo.enums.LineBaseEnum;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.Line;
+import com.njcn.product.terminal.mysqlTerminal.pojo.po.PqStation;
 import com.njcn.product.terminal.mysqlTerminal.pojo.vo.TerminalShowVO;
 import com.njcn.product.diagram.LedgerScale.service.LedgerScaleService;
 import com.njcn.product.system.dict.mapper.DictDataMapper;
 import com.njcn.product.system.dict.pojo.enums.DicDataTypeEnum;
 import com.njcn.product.system.dict.pojo.po.DictData;
-import com.njcn.product.terminal.mysqlTerminal.mapper.LedgerScaleMapper;
-import com.njcn.product.terminal.mysqlTerminal.mapper.RmpEventDetailMapper;
 import com.njcn.product.terminal.mysqlTerminal.pojo.dto.LedgerBaseInfo;
 import com.njcn.product.terminal.mysqlTerminal.pojo.enums.RunFlagEnum;
 import com.njcn.product.terminal.mysqlTerminal.pojo.param.LargeScreenCountParam;
@@ -51,7 +47,6 @@ import org.springframework.stereotype.Service;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -80,8 +75,8 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
     private final RespDataResultMapper respDataResultMapper;
 
     private final FileStorageUtil fileStorageUtil;
-    private final UserReportPOMapper userReportPOMapper;
     private final UpHarmonicDetailMapper upHarmonicDetailMapper;
+    private final PqStationMapper pqStationMapper;
 
 
     @Override
@@ -489,5 +484,32 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
         return new ArrayList<>();
     }
 
+    @Override
+    public List<PqStation> stationMap(LargeScreenCountParam param) {
+        List<PqStation> result = new ArrayList<>();
+        List<String> runIds = commGeneralService.getRunLineIdsByDept(param.getDeptId());
+        if(CollUtil.isEmpty(runIds)){
+            return result;
+        }
+        List<Line> lineList = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,runIds));
+        List<String> stationIds = lineList.stream().map(it->it.getPids().split(StrUtil.COMMA)[LineBaseEnum.SUB_LEVEL.getCode()]).distinct().collect(Collectors.toList());
+        List<Line> stationResult = lineMapper.selectList(new LambdaQueryWrapper<Line>().in(Line::getId,stationIds));
+        List<String> ids = stationResult.stream().map(Line::getId).distinct().collect(Collectors.toList());
+        List<PqStation> pqStationList = pqStationMapper.selectList(new LambdaQueryWrapper<PqStation>().in(PqStation::getId,ids));
+        Map<String, PqStation> substationMap = pqStationList.stream().collect(Collectors.toMap(PqStation::getId, po->po));
+        stationResult.forEach(it->{
+            PqStation pqStation = new PqStation();
+            if(substationMap.containsKey(it.getId())){
+                PqStation tem = substationMap.get(it.getId());
+                pqStation.setLng(tem.getLng());
+                pqStation.setLat(tem.getLat());
+            }
+            pqStation.setId(it.getId());
+            pqStation.setName(it.getName());
+            result.add(pqStation);
+        });
+        return result;
+    }
+
 
 }
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/LedgerTreeService.java b/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/LedgerTreeService.java
deleted file mode 100644
index b360b48..0000000
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/LedgerTreeService.java
+++ /dev/null
@@ -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();
-}
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LedgerTreeController.java b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LedgerTreeController.java
index f56b37f..038db87 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LedgerTreeController.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LineController.java b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LineController.java
index 31b5bbf..c5946fc 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/controller/LineController.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/PqStationMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/PqStationMapper.java
new file mode 100644
index 0000000..5008b96
--- /dev/null
+++ b/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> {
+
+}
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/dto/LedgerTreeDTO.java b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/dto/LedgerTreeDTO.java
index d959070..8cfd395 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/dto/LedgerTreeDTO.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/po/PqStation.java b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/pojo/po/PqStation.java
new file mode 100644
index 0000000..47c8c82
--- /dev/null
+++ b/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;
+
+
+}
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqDeviceDetailMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceDetailMapper.java
similarity index 60%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqDeviceDetailMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceDetailMapper.java
index 2b9e285..5bba6af 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqDeviceDetailMapper.java
+++ b/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
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqDeviceMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceMapper.java
similarity index 76%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqDeviceMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqDeviceMapper.java
index efdda14..43f4e8c 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqDeviceMapper.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqGdCompanyMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqGdCompanyMapper.java
similarity index 66%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqGdCompanyMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqGdCompanyMapper.java
index acc2ff6..de3e006 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqGdCompanyMapper.java
+++ b/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;
 
 /**
  *
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqLineMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLineMapper.java
similarity index 74%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqLineMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLineMapper.java
index 68b3c91..35bd2b9 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqLineMapper.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqLinedetailMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLinedetailMapper.java
similarity index 59%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqLinedetailMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqLinedetailMapper.java
index f84d33e..b91d620 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqLinedetailMapper.java
+++ b/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
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqSubstationMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqSubstationMapper.java
similarity index 66%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqSubstationMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqSubstationMapper.java
index 89c2085..3c4bca6 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqSubstationMapper.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqsDeptslineMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsDeptslineMapper.java
similarity index 72%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqsDeptslineMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsDeptslineMapper.java
index 3f032c7..fec0aed 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqsDeptslineMapper.java
+++ b/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;
 
 /**
  * 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqsStationMapMapper.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsStationMapMapper.java
similarity index 67%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqsStationMapMapper.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/PqsStationMapMapper.java
index bbf6f15..42b97f1 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/PqsStationMapMapper.java
+++ b/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;
 
 /**
  *
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqDeviceMapper.xml b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqDeviceMapper.xml
similarity index 97%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqDeviceMapper.xml
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqDeviceMapper.xml
index e5a326d..514099b 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqDeviceMapper.xml
+++ b/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,
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqLineMapper.xml b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqLineMapper.xml
similarity index 97%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqLineMapper.xml
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqLineMapper.xml
index db278fc..68eecf5 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqLineMapper.xml
+++ b/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,
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqSubstationMapper.xml b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqSubstationMapper.xml
similarity index 94%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqSubstationMapper.xml
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/mapper/mapping/PqSubstationMapper.xml
index 01c1e6a..e1ec368 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/mapper/mapping/PqSubstationMapper.xml
+++ b/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,
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/DeviceDTO.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDTO.java
similarity index 94%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/DeviceDTO.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDTO.java
index 1445451..c3076bd 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/DeviceDTO.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/DeviceDeptDTO.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDeptDTO.java
similarity index 81%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/DeviceDeptDTO.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/DeviceDeptDTO.java
index f084dd6..56747d9 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/DeviceDeptDTO.java
+++ b/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;
 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/LedgerBaseInfoDTO.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/LedgerBaseInfoDTO.java
similarity index 90%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/LedgerBaseInfoDTO.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/LedgerBaseInfoDTO.java
index b0ff2b8..5164ff7 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/LedgerBaseInfoDTO.java
+++ b/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;
 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/OracleLedgerTreeDTO.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/OracleLedgerTreeDTO.java
similarity index 86%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/OracleLedgerTreeDTO.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/OracleLedgerTreeDTO.java
index 755a086..86c747c 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/OracleLedgerTreeDTO.java
+++ b/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;
 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/PqsDeptDTO.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/PqsDeptDTO.java
similarity index 94%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/PqsDeptDTO.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/PqsDeptDTO.java
index 8c74107..02f7b82 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/PqsDeptDTO.java
+++ b/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;
 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/SubstationDTO.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/SubstationDTO.java
similarity index 85%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/SubstationDTO.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/dto/SubstationDTO.java
index 7a8405d..16c89b8 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/dto/SubstationDTO.java
+++ b/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;
 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqDevice.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDevice.java
similarity index 97%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqDevice.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDevice.java
index dab495f..c97dbbb 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqDevice.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqDeviceDetail.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDeviceDetail.java
similarity index 96%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqDeviceDetail.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqDeviceDetail.java
index 36df722..c635130 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqDeviceDetail.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqGdCompany.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqGdCompany.java
similarity index 89%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqGdCompany.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqGdCompany.java
index 6b8524e..90d17b8 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqGdCompany.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqLine.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLine.java
similarity index 97%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqLine.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLine.java
index c701829..875a568 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqLine.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqLinedetail.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLinedetail.java
similarity index 94%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqLinedetail.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqLinedetail.java
index f35456c..3f1809a 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqLinedetail.java
+++ b/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
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqSubstation.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqSubstation.java
similarity index 93%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqSubstation.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqSubstation.java
index 119b880..90bd71b 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqSubstation.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqsDeptsline.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsDeptsline.java
similarity index 87%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqsDeptsline.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsDeptsline.java
index 24795d7..0a3d1cd 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqsDeptsline.java
+++ b/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;
 
 /**
  * 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqsStationMap.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsStationMap.java
similarity index 94%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqsStationMap.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/pojo/po/PqsStationMap.java
index 81a0fd5..5fd73fb 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/pojo/po/PqsStationMap.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/LedgerTreeService.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/LedgerTreeService.java
new file mode 100644
index 0000000..6ba575f
--- /dev/null
+++ b/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();
+}
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqDeviceService.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqDeviceService.java
similarity index 68%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqDeviceService.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqDeviceService.java
index 48011df..7d7d566 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqDeviceService.java
+++ b/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;
 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqLineService.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqLineService.java
similarity index 71%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqLineService.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqLineService.java
index 11a49be..c53fde3 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqLineService.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqSubstationService.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqSubstationService.java
similarity index 63%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqSubstationService.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqSubstationService.java
index 0722b88..78d2eeb 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqSubstationService.java
+++ b/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;
 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqsDeptslineService.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqsDeptslineService.java
similarity index 67%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqsDeptslineService.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/PqsDeptslineService.java
index 8ca0593..4582489 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/PqsDeptslineService.java
+++ b/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;
 
 /**
  * 
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/LedgerTreeServiceImpl.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/LedgerTreeServiceImpl.java
similarity index 82%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/LedgerTreeServiceImpl.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/LedgerTreeServiceImpl.java
index f5fe5d4..3edeffe 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/LedgerTreeServiceImpl.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqDeviceServiceImpl.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqDeviceServiceImpl.java
similarity index 70%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqDeviceServiceImpl.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqDeviceServiceImpl.java
index a7da9fa..8d58dde 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqDeviceServiceImpl.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqLineServiceImpl.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqLineServiceImpl.java
similarity index 85%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqLineServiceImpl.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqLineServiceImpl.java
index 0141bfb..c7723bd 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqLineServiceImpl.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqSubstationServiceImpl.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqSubstationServiceImpl.java
similarity index 60%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqSubstationServiceImpl.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqSubstationServiceImpl.java
index c87bb4d..638fadb 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqSubstationServiceImpl.java
+++ b/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;
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqsDeptslineServiceImpl.java b/cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqsDeptslineServiceImpl.java
similarity index 57%
rename from cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqsDeptslineServiceImpl.java
rename to cn-terminal/src/main/java/com/njcn/product/terminal/oracleDevice/service/impl/PqsDeptslineServiceImpl.java
index 41a94b0..652e0c9 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/device/service/impl/PqsDeptslineServiceImpl.java
+++ b/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;