emm

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NatInfoScanTask.java

@@ -30,14 +30,14 @@ public class NatInfoScanTask implements ITask {
         if (StringUtils.isNotBlank(params)) {
             formDTO = JSON.parseObject(params, DataSyncTaskParam.class);
         }
-        /*Result result = userOpenFeignClient.natInfoScanTask(formDTO);
+        /*Result result = userOpenFeignClient.dataSyncForYanTaiTask(formDTO);
         if (result.success()) {
             log.info("NatInfoScanTask定时任务执行成功");
         } else {
             log.error("NatInfoScanTask定时任务执行失败:" + result.getMsg());
         }*/
         // 核酸检测
-        Result natResult = userOpenFeignClient.natInfoScanTaskV2(formDTO);
+        Result natResult = userOpenFeignClient.natInfoScanTask(formDTO);
         if (natResult.success()) {
             log.info("NatInfoScanTask定时任务执行成功");
         } else {

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -923,7 +923,7 @@ public interface EpmetUserOpenFeignClient {
     Result<DingLoginResiResDTO> dingResiLogin(@RequestBody  DingLoginResiFormDTO formDTO);
 
     @PostMapping("/epmetuser/dataSyncConfig/dataSyncForYanTaiTask")
-    Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO);
+    Result dataSyncForYanTaiTask(@RequestBody DataSyncTaskParam formDTO);
 
     /**
      * Desc: 客户下所有工作人员放缓存
@@ -945,7 +945,7 @@ public interface EpmetUserOpenFeignClient {
     Result<Integer> getAllResiByGrid(@RequestBody AllResiByGridFormDTO formDTO);
 
     @PostMapping("/epmetuser/dataSyncConfig/natInfoScanTask")
-    Result natInfoScanTaskV2(@RequestBody DataSyncTaskParam formDTO);
+    Result natInfoScanTask(@RequestBody DataSyncTaskParam formDTO);
 
     @PostMapping("/epmetuser/dataSyncConfig/deathInfoScanTask")
     Result deathInfoScanTask(@RequestBody DataSyncTaskParam formDTO);

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -713,8 +713,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result natInfoScanTask(DataSyncTaskParam formDTO) {
+    public Result dataSyncForYanTaiTask(DataSyncTaskParam formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTask", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "dataSyncForYanTaiTask", formDTO);
     }
 
     @Override
@@ -728,7 +728,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result natInfoScanTaskV2(DataSyncTaskParam formDTO) {
+    public Result natInfoScanTask(DataSyncTaskParam formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "natInfoScanTaskV2", formDTO);
     }