<feat> 完善校时配置下发功能

<refactor> 重构导出代码
<fix> 数据概览添加数据量默认值 0

fanxing-gateway/src/main/java/com/viontech/fanxing/forward/AuthorizationFilter.java

@@ -72,7 +72,6 @@ public class AuthorizationFilter implements GlobalFilter {
     }
 
     private ImmutablePair<Boolean, String> checkToken(String token) {
-        // todo authorize
         String username;
         try {
             Map<String, String> api = new HashMap<>(2);

fanxing-ops/src/main/java/com/viontech/fanxing/ops/controller/main/OpsController.java

@@ -3,10 +3,8 @@ package com.viontech.fanxing.ops.controller.main;
 import com.viontech.fanxing.commons.base.BaseController;
 import com.viontech.fanxing.ops.model.OpsServer;
 import com.viontech.fanxing.ops.service.main.OpsServerService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 
@@ -30,4 +28,10 @@ public class OpsController {
         return BaseController.success();
     }
 
+    @PostMapping("updateVaServer")
+    public Object updateVaServer(@RequestParam String[] devIdArr, @RequestParam MultipartFile file) {
+        opsServerService.updateVaServer(devIdArr, file);
+        return BaseController.success();
+    }
+
 }

fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/impl/ContentServiceImpl.java

@@ -8,7 +8,9 @@ import com.viontech.fanxing.commons.model.Content;
 import com.viontech.fanxing.commons.model.ContentExample;
 import com.viontech.fanxing.commons.model.main.ImageKeepConfig;
 import com.viontech.fanxing.ops.mapper.ContentMapper;
+import com.viontech.fanxing.ops.model.OpsServer;
 import com.viontech.fanxing.ops.service.adapter.ContentService;
+import com.viontech.fanxing.ops.service.main.OpsServerService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,6 +23,8 @@ public class ContentServiceImpl extends BaseServiceImpl<Content> implements Cont
     private static final String NAME_IMAGE_KEEP_CONFIG = "imageKeepConfig";
     @Resource
     private ContentMapper contentMapper;
+    @Resource
+    private OpsServerService opsServerService;
 
 
     @Override
@@ -57,7 +61,10 @@ public class ContentServiceImpl extends BaseServiceImpl<Content> implements Cont
         contentExample.createCriteria().andTypeEqualTo(TYPE_PLATFORM_CONFIG).andNameEqualTo(NAME_TIMING_CONFIG);
         addOrUpdate(TYPE_PLATFORM_CONFIG, NAME_TIMING_CONFIG, jsonObject.toJSONString());
         // todo 发给运维服务
-
+        List<OpsServer> opsServers = opsServerService.listAll();
+        for (OpsServer opsServer : opsServers) {
+            opsServerService.distributeTimingConfig(opsServer, jsonObject);
+        }
     }
 
 

fanxing-ops/src/main/java/com/viontech/fanxing/ops/service/main/OpsServerService.java

 package com.viontech.fanxing.ops.service.main;
 
+import com.alibaba.fastjson.JSONObject;
 import com.viontech.fanxing.ops.model.OpsServer;
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RBucket;
 import org.redisson.api.RKeys;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.reactive.function.client.WebClient;
 
 import javax.annotation.Resource;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -19,6 +24,7 @@ import java.util.List;
  */
 
 @Service
+@Slf4j
 public class OpsServerService {
 
     @Resource
@@ -29,7 +35,7 @@ public class OpsServerService {
         addOrUpdateOpsServer(opsServer);
     }
 
-    private List<OpsServer> listAll() {
+    public List<OpsServer> listAll() {
         ArrayList<OpsServer> opsServers = new ArrayList<>();
         RKeys keys = redissonClient.getKeys();
         Iterable<String> pattern = keys.getKeysByPattern("ops:server:*");
@@ -39,7 +45,7 @@ public class OpsServerService {
         return opsServers;
     }
 
-    private OpsServer getOpsServerFromRedisByIp(String ip) {
+    public OpsServer getOpsServerFromRedisByIp(String ip) {
         RBucket<OpsServer> bucket = redissonClient.getBucket("ops:server:" + ip);
         if (bucket.isExists()) {
             OpsServer opsServer = bucket.get();
@@ -54,6 +60,29 @@ public class OpsServerService {
         }
     }
 
+    public void distributeTimingConfig(OpsServer opsServer, JSONObject jsonObject) {
+        try {
+            String ip = opsServer.getIp();
+            Integer port = opsServer.getPort();
+
+            JSONObject nvsResponse = WebClient.create()
+                    .post()
+                    .uri(uriBuilder -> uriBuilder.scheme("http").host(ip).port(port).path("/api/v1/isg/timing").build())
+                    .bodyValue(jsonObject.toJSONString())
+                    .retrieve()
+                    .bodyToMono(JSONObject.class)
+                    .block(Duration.ofSeconds(20));
+
+        } catch (Exception e) {
+            log.error("下发校时配置失败", e);
+        }
+    }
+
+    public void updateVaServer(String[] devIdArr, MultipartFile file) {
+        // todo 保存文件到本地,根据 devIdArr 获取对应分析服务,再根据分析服务的 ip 获取对应的运维服务,下发文件地址和升级信息
+        log.info("收到升级请求,目标服务:{},文件:{}", Arrays.toString(devIdArr), file.getName());
+    }
+
     private void addOrUpdateOpsServer(OpsServer opsServer) {
         RBucket<OpsServer> bucket = redissonClient.getBucket("ops:server:" + opsServer.getIp());
         bucket.set(opsServer);

fanxing-query/src/main/java/com/viontech/fanxing/query/model/DataOverViewModel.java

@@ -14,9 +14,9 @@ import lombok.Setter;
 @Setter
 public class DataOverViewModel {
     private Long taskId;
-    private Long traffic;
-    private Long flow;
-    private Long behavior;
+    private Long traffic = 0L;
+    private Long flow = 0L;
+    private Long behavior = 0L;
     private Integer hour;
     private String taskName;
     private Integer effectiveAnalysisTime;

fanxing-query/src/main/java/com/viontech/fanxing/query/runner/ExportDataJob.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.google.common.base.Function;
 import com.viontech.fanxing.commons.config.VionConfig;
 import com.viontech.fanxing.commons.exception.FanXingException;
 import com.viontech.fanxing.commons.model.*;
@@ -27,6 +28,7 @@ import com.viontech.keliu.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.redisson.api.RLock;
 import org.springframework.context.annotation.Profile;
@@ -126,9 +128,15 @@ public class ExportDataJob {
         TrafficFlowRequestVo trafficFlowRequestVo = JSON.parseObject(param, TrafficFlowRequestVo.class);
         String statisticType = trafficFlowRequestVo.getStatistic_type();
         int nextPage = 1;
+        boolean interrupted = false;
         List<String> pathList = new ArrayList<>();
-
         while (nextPage != 0) {
+            // 如果被删除了则需要打断
+            if (needInterrupt(item.getId())) {
+                log.info("任务已被删除,打断任务");
+                interrupted = true;
+                break;
+            }
             trafficFlowRequestVo.setOffset((nextPage - 1) * pageSize);
             trafficFlowRequestVo.setLimit(pageSize);
             Map<String, Object> stringObjectMap = flowEventController.statisticsResult(trafficFlowRequestVo);
@@ -171,8 +179,28 @@ public class ExportDataJob {
             int totalpage = (totalNum / pageSize) + ((totalNum % pageSize) > 0 ? 1 : 0);
             nextPage = nextPage < totalpage ? nextPage + 1 : 0;
         }
-        item.setPath(JSON.toJSONString(pathList));
-        exportDataService.updateByPrimaryKeySelective(item);
+        // 如果被删除了则需要打断
+        if (needInterrupt(item.getId())) {
+            log.info("任务已被删除,打断任务");
+            interrupted = true;
+        }
+        if (interrupted) {
+            new Thread(() -> {
+                try {
+                    File file = new File(vionConfig.getImage().getPath() + "/export/" + item.getId());
+                    while (file.exists()) {
+                        FileUtils.deleteDirectory(file);
+                        Thread.sleep(10L);
+                        log.info("删除目录:{}", file.getPath());
+                    }
+                } catch (Exception e) {
+                    log.error("中断了,删除失败", e);
+                }
+            }).start();
+        } else {
+            item.setPath(JSON.toJSONString(pathList));
+            exportDataService.updateByPrimaryKeySelective(item);
+        }
     }
 
     private ExcelWriter getWriter() {
@@ -184,6 +212,84 @@ public class ExportDataJob {
         return writer;
     }
 
+
+    private <K> ImmutableTriple<Boolean, String, Integer> export(ExportData item, Function<Integer, PageInfo<K>> getJsonData, Function<K, ExportBaseModel> build, boolean withPic, boolean withVideo, Integer nextPage,
+                                                                 Function<K, String> getPic, Function<K, String> getVideo) {
+        if (needInterrupt(item.getId())) {
+            log.info("任务已被删除,打断任务");
+            return ImmutableTriple.of(false, null, null);
+        }
+        PageInfo<K> jsonData = getJsonData.apply(nextPage);
+        log.info("数据总量:{}", jsonData.getTotal());
+        item.setCount(jsonData.getTotal());
+        List<K> list = jsonData.getList();
+        if (list.size() == 0) {
+            return ImmutableTriple.of(false, null, null);
+        }
+        String path = vionConfig.getImage().getPath() + "/export/" + item.getId() + "/" + item.getName() + "_" + nextPage + ".zip";
+        File zipFile = new File(path);
+        zipFile.getParentFile().mkdirs();
+        try (ZipOutputStream zipO = new ZipOutputStream(new FileOutputStream(zipFile))) {
+
+            List<ExportBaseModel> excelData = new ArrayList<>();
+            for (K vo : list) {
+
+                // 添加数据
+                ExportBaseModel o;
+                try {
+                    o = build.apply(vo);
+                } catch (Exception e) {
+                    log.error("", e);
+                    continue;
+                }
+                excelData.add(o);
+
+                // 写入图片文件
+                if (withPic && StringUtils.isNotEmpty(getPic.apply(vo))) {
+                    File file = new File(getPic.apply(vo));
+                    o.setPicName(new FormulaCellValue(getHyperLink(file.getName())));
+                    if (file.exists()) {
+                        try {
+                            byte[] bytes = FileUtils.readFileToByteArray(file);
+                            zipO.putNextEntry(new ZipEntry(file.getName()));
+                            zipO.write(bytes);
+                        } catch (Exception e) {
+                            log.error("", e);
+                        }
+
+                    }
+                }
+                // 写入视频文件
+                if (withVideo && StringUtils.isNotEmpty(getVideo.apply(vo))) {
+                    File file = new File(getVideo.apply(vo));
+                    o.setVideoName(new FormulaCellValue(getHyperLink(file.getName())));
+                    if (file.exists()) {
+                        try {
+                            byte[] bytes = FileUtils.readFileToByteArray(file);
+                            zipO.putNextEntry(new ZipEntry(file.getName()));
+                            zipO.write(bytes);
+                        } catch (Exception e) {
+                            log.error("", e);
+                        }
+                    }
+                }
+            }
+
+            // 写入 excel
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            ExcelWriter writer = getExcelWriter();
+            writer.write(excelData, true);
+            writer.flush(outputStream);
+            writer.close();
+            zipO.putNextEntry(new ZipEntry("data.xlsx"));
+            zipO.write(outputStream.toByteArray());
+        } catch (Exception e) {
+            log.error("", e);
+        }
+        nextPage = jsonData.getNextPage();
+        return ImmutableTriple.of(true, path, nextPage);
+    }
+
     private void exportTraffic(ExportData item, int type) {
         item.setStatus(1);
         boolean withVideo = item.getWithVideo() == 1;
@@ -195,78 +301,26 @@ public class ExportDataJob {
         int nextPage = 1;
         List<String> pathList = new ArrayList<>();
         while (nextPage != 0) {
-            PageInfo<TrafficVo> jsonData = trafficService.getJsonData(example, nextPage, pageSize);
-            log.info("数据总量:{}", jsonData.getTotal());
-            item.setCount(jsonData.getTotal());
-            List<TrafficVo> list = jsonData.getList();
-            if (list.size() == 0) {
+            ImmutableTriple<Boolean, String, Integer> export = export(item,
+                    (page) -> trafficService.getJsonData(example, page, pageSize),
+                    x -> buildTrafficData(type, x), withPic, withVideo, nextPage,
+                    TrafficVo::getPics, TrafficVo::getVideoName);
+            if (export.left) {
+                String path = export.middle;
+                pathList.add(path);
+                nextPage = export.right;
+            } else {
                 break;
             }
-            String path = vionConfig.getImage().getPath() + "/export/" + item.getId() + "/" + item.getName() + "_" + nextPage + ".zip";
-            pathList.add(path);
-            File zipFile = new File(path);
-            zipFile.getParentFile().mkdirs();
-            try (ZipOutputStream zipO = new ZipOutputStream(new FileOutputStream(zipFile))) {
-
-                List<ExportBaseModel> excelData = new ArrayList<>();
-                for (TrafficVo vo : list) {
-
-                    // 添加数据
-                    ExportBaseModel o;
-                    try {
-                        o = buildTrafficData(type, vo);
-                    } catch (Exception e) {
-                        log.error("", e);
-                        continue;
-                    }
-                    excelData.add(o);
-
-                    // 写入图片文件
-                    if (withPic && StringUtils.isNotEmpty(vo.getPics())) {
-                        File file = new File(vo.getPics());
-                        o.setPicName(new FormulaCellValue(getHyperLink(file.getName())));
-                        if (file.exists()) {
-                            try {
-                                byte[] bytes = FileUtils.readFileToByteArray(file);
-                                zipO.putNextEntry(new ZipEntry(file.getName()));
-                                zipO.write(bytes);
-                            } catch (Exception e) {
-                                log.error("", e);
-                            }
-
-                        }
-                    }
-                    // 写入视频文件
-                    if (withVideo && StringUtils.isNotEmpty(vo.getVideoName())) {
-                        File file = new File(vo.getVideoName());
-                        o.setVideoName(new FormulaCellValue(getHyperLink(file.getName())));
-                        if (file.exists()) {
-                            try {
-                                byte[] bytes = FileUtils.readFileToByteArray(file);
-                                zipO.putNextEntry(new ZipEntry(file.getName()));
-                                zipO.write(bytes);
-                            } catch (Exception e) {
-                                log.error("", e);
-                            }
-                        }
-                    }
-                }
-
-                // 写入 excel
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                ExcelWriter writer = getExcelWriter();
-                writer.write(excelData, true);
-                writer.flush(outputStream);
-                writer.close();
-                zipO.putNextEntry(new ZipEntry("data.xlsx"));
-                zipO.write(outputStream.toByteArray());
-            } catch (Exception e) {
-                log.error("", e);
-            }
-            nextPage = jsonData.getNextPage();
         }
-        item.setPath(JSON.toJSONString(pathList));
-        exportDataService.updateByPrimaryKeySelective(item);
+        // 如果被删除了则需要打断
+        if (needInterrupt(item.getId())) {
+            log.info("任务已被删除,打断任务");
+            deleteAsync(vionConfig.getImage().getPath() + "/export/" + item.getId());
+        } else {
+            item.setPath(JSON.toJSONString(pathList));
+            exportDataService.updateByPrimaryKeySelective(item);
+        }
     }
 
     private void exportBehavior(ExportData item) {
@@ -278,95 +332,45 @@ public class ExportDataJob {
         BehaviorVo behaviorVo = JSON.parseObject(param, BehaviorVo.class);
         BehaviorExample example = behaviorController.getExample(behaviorVo);
         int nextPage = 1;
-        boolean interrupted = false;
         List<String> pathList = new ArrayList<>();
         while (nextPage != 0) {
-            // 如果被删除了则需要打断
-            if (needInterrupt(item.getId())) {
-                log.info("任务已被删除,打断任务");
-                interrupted = true;
+            ImmutableTriple<Boolean, String, Integer> export = export(item,
+                    (page) -> behaviorService.getJsonData(example, page, pageSize),
+                    this::buildBehaviorModel, withPic, withVideo, nextPage,
+                    BehaviorVo::getPics, BehaviorVo::getVideo);
+            if (export.left) {
+                String path = export.middle;
+                pathList.add(path);
+                nextPage = export.right;
+            } else {
                 break;
             }
-
-            PageInfo<BehaviorVo> jsonData = behaviorService.getJsonData(example, nextPage, pageSize);
-            log.info("数据总量:{}", jsonData.getTotal());
-            item.setCount(jsonData.getTotal());
-            List<BehaviorVo> list = jsonData.getList();
-            if (list.size() == 0) {
-                break;
-            }
-            String path = vionConfig.getImage().getPath() + "/export/" + item.getId() + "/" + item.getName() + "_" + nextPage + ".zip";
-            pathList.add(path);
-            File zipFile = new File(path);
-            zipFile.getParentFile().mkdirs();
-            try (ZipOutputStream zipO = new ZipOutputStream(new FileOutputStream(zipFile))) {
-                List<ExportBaseModel> excelData = new ArrayList<>();
-                for (BehaviorVo vo : list) {
-
-                    ExportBaseModel o = buildBehaviorModel(vo);
-                    excelData.add(o);
-
-                    // 写入图片文件
-                    if (withPic && StringUtils.isNotEmpty(vo.getPics())) {
-                        File file = new File(vo.getPics());
-                        if (file.exists()) {
-                            try {
-                                byte[] bytes = FileUtils.readFileToByteArray(file);
-                                zipO.putNextEntry(new ZipEntry(file.getName()));
-                                zipO.write(bytes);
-                                o.setPicName(new FormulaCellValue(getHyperLink(file.getName())));
-                            } catch (Exception e) {
-                                log.error("", e);
-                            }
-                        }
-                    }
-                    // 写入视频文件
-                    if (withVideo && StringUtils.isNotEmpty(vo.getVideo())) {
-                        File file = new File(vo.getVideo());
-                        if (file.exists()) {
-                            try {
-                                byte[] bytes = FileUtils.readFileToByteArray(file);
-                                zipO.putNextEntry(new ZipEntry(file.getName()));
-                                zipO.write(bytes);
-                                o.setVideoName(new FormulaCellValue(getHyperLink(file.getName())));
-                            } catch (Exception e) {
-                                log.error("", e);
-                            }
-                        }
-                    }
-                }
-                // 写入 excel
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                ExcelWriter writer = getExcelWriter();
-                writer.write(excelData, true);
-                writer.flush(outputStream);
-                writer.close();
-                zipO.putNextEntry(new ZipEntry("data.xlsx"));
-                zipO.write(outputStream.toByteArray());
-            } catch (Exception e) {
-                log.error("", e);
-            }
-            nextPage = jsonData.getNextPage();
         }
-        if (interrupted) {
-            new Thread(() -> {
-                try {
-                    File file = new File(vionConfig.getImage().getPath() + "/export/" + item.getId());
-                    while (file.exists()) {
-                        FileUtils.deleteDirectory(file);
-                        Thread.sleep(10L);
-                        log.info("删除目录:{}", file.getPath());
-                    }
-                } catch (Exception e) {
-                    log.error("中断了,删除失败", e);
-                }
-            }).start();
+        // 如果被删除了则需要打断
+        if (needInterrupt(item.getId())) {
+            log.info("任务已被删除,打断任务");
+            deleteAsync(vionConfig.getImage().getPath() + "/export/" + item.getId());
         } else {
             item.setPath(JSON.toJSONString(pathList));
             exportDataService.updateByPrimaryKeySelective(item);
         }
     }
 
+    private void deleteAsync(String path) {
+        new Thread(() -> {
+            try {
+                File file = new File(path);
+                while (file.exists()) {
+                    FileUtils.deleteDirectory(file);
+                    Thread.sleep(10L);
+                    log.info("删除目录:{}", file.getPath());
+                }
+            } catch (Exception e) {
+                log.error("中断了,删除失败", e);
+            }
+        }).start();
+    }
+
     private boolean needInterrupt(Long id) {
         ExportData exportData = exportDataService.selectByPrimaryKey(id);
         return exportData == null;

fanxing-task/src/main/java/com/viontech/fanxing/task/model/runtime/RandomRuntimeConfig.java

@@ -36,7 +36,7 @@ public class RandomRuntimeConfig implements RuntimeConfig {
     @Override
     public ImmutablePair<Long, Long> getNextTimeOfExecutionAndTerminal() {
 
-        //  todo 目前逻辑还未定
+        //  todo 目前逻辑还未定,只有手动启动才会执行一次
         long running = TimeUnit.MINUTES.toMillis(runningTime);
         Date date = DateUtil.setDayMinTime(new Date());
         long time = date.getTime() - running;