diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
index 7da983b..741b8f9 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -2,8 +2,8 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
-import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
 import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
index 36623be..e9de33c 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@@ -3,8 +3,8 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
-import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.springframework.stereotype.Component;
 
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenBasicDataPushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenBasicDataPushTaskImpl.java
index 272ca99..c32e829 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenBasicDataPushTaskImpl.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenBasicDataPushTaskImpl.java
@@ -2,7 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.dto.ScreenJobBasicDataParamDTO;
-import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.ScreenBasicDataPushTask;
 import org.apache.commons.lang3.StringUtils;
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java
index 538a91b..c347d13 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java
@@ -2,7 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.dao.ScreenRecordDao;
-import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
 import com.elink.esua.epdc.entity.ScreenRecordEntity;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.ScreenProjectDataMonthPushTask;
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMonthTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMonthTaskImpl.java
index 305974e..b07cbd7 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMonthTaskImpl.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMonthTaskImpl.java
@@ -2,7 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.dto.ScreenJobMonthDataParamDTO;
-import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.ScreenProjectDataMonthPushTask;
 import org.apache.commons.lang3.StringUtils;
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java
index 9f1b346..21aff95 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java
@@ -2,7 +2,7 @@ package com.elink.esua.epdc.task.screen;
 
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.dto.ScreenGridManagerParamDTO;
-import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java
index 7a2b178..0665d6c 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java
@@ -2,7 +2,7 @@ package com.elink.esua.epdc.task.screen;
 
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.dto.ScreenIndexBasicDataParamDTO;
-import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;