批量导入数据根据时间进行筛选

fiveep-controller/src/main/java/com/bizmatics/controller/web/es/RtAnalogControllerWeb.java

@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -42,8 +41,8 @@ public class RtAnalogControllerWeb {
     }
 
     @GetMapping("/addAll")
-    public void addAll(){
-        ratAnalogTask.addAll();
+    public void addAll(Date startTime,Date endTime){
+        ratAnalogTask.addAll(startTime,endTime);
     }
 
     @GetMapping("/list")

fiveep-service/src/main/java/com/bizmatics/service/job/RatAnalogTask.java

@@ -34,21 +34,8 @@ public class RatAnalogTask {
     @Autowired
     private HadSiteStaticMapper hadSiteStaticMapper;
 
-    public void addAll(){
-        List<Map<String, Object>> dateList = htAnalogDataMapper.getDateList(null,null);
-        for (Map<String,Object> map:dateList) {
-            long currentTimeMillis = System.currentTimeMillis();
-            int siteId = Integer.parseInt(map.get("siteId").toString());
-            Date date = DateUtils.parseDate(map.get("dat").toString());
-            HadSiteStatic hadSiteStatic = hadSiteStaticMax(siteId, date);
-            getSiteIco(siteId,date,hadSiteStatic);
-            addTime(date,siteId,hadSiteStatic);
-            hadSiteStaticMapper.insert(hadSiteStatic);
-            long currentTimeMillis1 = System.currentTimeMillis();
-            log.info("处理一条数据需要的时间"+(currentTimeMillis1-currentTimeMillis));
-        }
-        log.info("定时任务处理完成");
-
+    public void addAll(Date startTime,Date endTime){
+        addHadJobByDate(startTime,endTime);
     }
 
 
@@ -58,7 +45,11 @@ public class RatAnalogTask {
         Date newDate = new Date();
         Date dayStartTime = DateUtils.getDayStartTime(newDate);
         Date dayEndTime = DateUtils.getDayEndTime(newDate);
-        List<Map<String, Object>> dateList = htAnalogDataMapper.getDateList(dayStartTime,dayEndTime);
+        addHadJobByDate(dayStartTime,dayEndTime);
+    }
+
+    public void addHadJobByDate(Date startTime,Date endTime){
+        List<Map<String, Object>> dateList = htAnalogDataMapper.getDateList(startTime,endTime);
         for (Map<String,Object> map:dateList) {
             long currentTimeMillis = System.currentTimeMillis();
             int siteId = Integer.parseInt(map.get("siteId").toString());