111

src/main/java/com/fdkankan/Application.java

@@ -42,14 +42,14 @@ public class Application implements CommandLineRunner {
     @Override
     public void run(String... args) throws Exception {
 
-        Date date = new Date();
-        if(date.after(DateUtil.parse("2025-02-20", DatePattern.NORM_DATE_PATTERN))){
-            return;
-        }
-
-        log.info("推送历史数据开始");
-        convertService.pushOldHistory();
-        log.info("推送历史数据结束");
+//        Date date = new Date();
+//        if(date.after(DateUtil.parse("2025-02-20", DatePattern.NORM_DATE_PATTERN))){
+//            return;
+//        }
+
+//        log.info("推送历史数据开始");
+//        convertService.pushOldHistory();
+//        log.info("推送历史数据结束");
     }
 }
 

src/main/java/com/fdkankan/project/tieta/controller/ConvertController.java

@@ -178,10 +178,13 @@ public class ConvertController {
     @Autowired
     private FdfsUtil fdfsUtil;
 
-    public static void main(String[] args) {
-
 
+    @GetMapping("pushOldHistory")
+    public ResultData pushOldHistory(@RequestParam(value = "stationCode", required = false) String stationCode, @RequestParam(value = "entityId", required = false)String entityId){
+        convertService.pushOldHistory(stationCode, entityId);
+        return ResultData.ok();
     }
 
 
+
 }

src/main/java/com/fdkankan/project/tieta/service/IConvertService.java

@@ -12,7 +12,7 @@ public interface IConvertService {
 
     void scenePushHistory();
 
-    void pushOldHistory();
+    void pushOldHistory(String stationCode, String entityId);
 
 
 }

src/main/java/com/fdkankan/project/tieta/service/impl/ConvertServiceImpl.java

@@ -27,6 +27,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -112,10 +113,16 @@ public class ConvertServiceImpl implements IConvertService {
     }
 
     @Override
-    public void pushOldHistory() {
+    public void pushOldHistory(String stationCode, String entityId) {
+
+        log.info("推送历史数据开始");
         List<FullphotoUprecord> list = fullphotoUprecordService.list(new LambdaQueryWrapper<FullphotoUprecord>().select(FullphotoUprecord::getStationCode, FullphotoUprecord::getEntityId).groupBy(FullphotoUprecord::getStationCode, FullphotoUprecord::getEntityId));
         for (FullphotoUprecord fullphotoUprecord : list) {
 
+            if(StrUtil.isNotEmpty(entityId) && !entityId.equals(fullphotoUprecord.getEntityId())){
+                continue;
+            }
+
             try {
                 List<FullphotoUprecord> list1 = fullphotoUprecordService.list(
                         new LambdaQueryWrapper<FullphotoUprecord>()
@@ -156,6 +163,6 @@ public class ConvertServiceImpl implements IConvertService {
 
         }
 
-
+        log.info("推送历史数据结束");
     }
 }