diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
index 246e5935e..37e7f8b2c 100644
--- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
+++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
@@ -65,7 +65,6 @@ public class PowerDistributionareaParam {
     private String regionalism;
 
     @ApiModelProperty(name = "regionalism", value = "设备地区特征")
-    @NotBlank(message = "设备地区特征不可为空")
     private String devRegionalism;
 
     @ApiModelProperty(name = "ifRuralPowerGrid", value = "是否农网：0-否；1：是")
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java
index c2d511ca5..db0997fb1 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java
@@ -1,6 +1,7 @@
 package com.njcn.device.pms.controller.ledgerManger;
 
 import cn.hutool.core.date.TimeInterval;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -14,12 +15,15 @@ import com.njcn.device.biz.pojo.param.MonitorGetParam;
 import com.njcn.device.biz.pojo.param.SubstationParam;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
+import com.njcn.device.pms.mapper.majornetwork.PqsDeviceUnitMapper;
+import com.njcn.device.pms.pojo.po.DistributionMonitor;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pms.pojo.po.PmsTerminal;
 import com.njcn.device.pms.service.ledgerManger.CommTerminalService;
 import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
 import com.njcn.device.pms.service.majornetwork.IMonitorService;
 import com.njcn.device.pms.service.majornetwork.ITerminalService;
+import com.njcn.device.pq.pojo.vo.PqsDeviceUnitVo;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -56,6 +60,8 @@ public class CommTerminalController extends BaseController {
 
     private final ITerminalService terminalService;
 
+    private final PqsDeviceUnitMapper pqsDeviceUnitMapper;
+
 
     /**
      * 通过部门获取所有子集部门所拥有的监测点
@@ -323,7 +329,25 @@ public class CommTerminalController extends BaseController {
     @ApiImplicitParam(name = "lineId", value = "实体", required = true)
     public HttpResult<PqsDeviceUnit> lineUnitDetail(@RequestParam("lineId") String lineId) {
         String methodDescribe = getMethodDescribe("lineUnitDetail");
-        PqsDeviceUnit pqsDeviceUnit = new PqsDeviceUnit();
+        String devId;
+        if(lineId.contains("pmswifi_")){
+
+            DistributionMonitor distributionMonitor  = iDistributionMonitorService.getOne(new LambdaQueryWrapper<DistributionMonitor>().eq(DistributionMonitor::getMonitorId,lineId));
+            if(Objects.isNull(distributionMonitor)){
+                return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new PqsDeviceUnit(), methodDescribe);
+            }
+            devId = distributionMonitor.getTerminalId();
+        }else {
+            Monitor monitor = monitorService.getById(lineId);
+            if(Objects.isNull(monitor)){
+                return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new PqsDeviceUnit(), methodDescribe);
+            }
+            devId = monitor.getTerminalId();
+        }
+        PqsDeviceUnit pqsDeviceUnit = pqsDeviceUnitMapper.selectById(devId);
+        if(Objects.isNull(pqsDeviceUnit)){
+            pqsDeviceUnit = new PqsDeviceUnit();
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqsDeviceUnit, methodDescribe);
     }
 
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PqsDeviceUnitMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PqsDeviceUnitMapper.java
new file mode 100644
index 000000000..9c6c50da6
--- /dev/null
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PqsDeviceUnitMapper.java
@@ -0,0 +1,14 @@
+package com.njcn.device.pms.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
+import com.njcn.device.pq.pojo.vo.PqsDeviceUnitVo;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/8/21
+ */
+public interface PqsDeviceUnitMapper extends BaseMapper<PqsDeviceUnit> {
+}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java
index fc15ccc93..14757d3a9 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java
@@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -63,7 +64,7 @@ public class HistoryResultController extends BaseController {
     public HttpResult<List<HistoryDataResultVO>> getHistoryResult(@RequestBody @Validated HistoryParam historyParam) {
         String methodDescribe = getMethodDescribe("getHistoryResult");
         List<HistoryDataResultVO> list;
-        if (HistoryDataSource == 1) {
+        if (HistoryDataSource == 1 && !historyParam.getLineId()[0].contains("pmswifi_")) {
             list = oracleResultService.getHistoryResult(historyParam);
         } else {
             list = historyResultService.getHistoryResult(historyParam);