Merge branch 'main' of http://182.92.203.107:3000/libingkun/skyeyesystem

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/consts/JmJobModeEnum.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 public enum JmJobModeEnum implements CodeEnum<Integer> {
 
     QUICK(1, "快速模式"),
-
+    CRUISE(2, "巡航模式"),
     CREATE(3, "航线创建")
     ;
 

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/dto/JmUavStatusDTO.java

@@ -60,7 +60,7 @@ public class JmUavStatusDTO {
     private String sarIp;
 
     /** sar 图片亮度 */
-    private Integer sarImageLight;
+    private volatile Integer sarImageLight;
 
     /**
      * 获取sar当前状态

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarControlServiceImpl.java

@@ -18,6 +18,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.Optional;
 
+import static com.zhangy.skyeye.jm.consts.JmJobModeEnum.CRUISE;
+
 /**
  * 控制指令
  */
@@ -44,7 +46,11 @@ public class SarControlServiceImpl implements ISarControlService {
             param.setMoto(sar.getMoto());
             param.setImageBit(sar.getImageBit());
             param.setResolution(sar.getResolution());
+            if (job.getMode().equals(CRUISE.getCode())) {
+                param.setControlType(SarControlTypeEnum.TURNON);
+            } else {
                 param.setControlType(SarControlTypeEnum.AUTO);
+            }
             double startAltitude = uav.getStartAltitude();
             // 高度加上起始高度
             Optional.ofNullable(param.getAirlineList())

frontend/Skyeye-sys-ui/resource/dt-chart/dist/demo.html

@@ -0,0 +1,10 @@
+<meta charset="utf-8">
+<title>dt-chart demo</title>
+<script src="./dt-chart.umd.js"></script>
+
+<link rel="stylesheet" href="./dt-chart.css">
+
+
+<script>
+console.log(dt-chart)
+</script>

frontend/Skyeye-sys-ui/resource/dt-chart/dist/dt-chart.umd.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dt-chart.umd.min.js","sources":["webpack://dt-chart/dt-chart.umd.min.js"],"mappings":"AAAA;AA+HA;AAAA;AAqEA;AAAA;AA+HA;AAAA;AA0FA;AAAA;AAsNA;AAAA;AAuEA;AAAA;AAiLA;AAAA;AA0HA;AAAA;AAkGA;AAAA;AA4NA;AAAA;AAyFA;AAAA;AAqFA;AAAA;AAyHA;AAAA;AAqEA;AAAA;AAyEA;AAAA;AAiGA;AAAA;AAqQA;AAAA;AAoMA;AAAA;AA8IA;AAAA;AA8HA;AAAA;AAkYA;AAAA;AA2JA;AAAA;AAqMA;AAAA;AA6LA;AAAA;AA8JA;AAAA;AAuMA;AAAA;AA4IA;AAAA;AA8FA;AAAA;AAmKA;AAAA;AAmHA;AAAA;AAwHA;AAAA;AAgFA;AAAA;AAqFA;AAAA;AAyNA;AAAA;AA0IA;AAAA;AAkHA;AAAA;AA4JA;AAAA;AAiRA;AAAA;AAiJA;AAAA;AAsmBA;AAAA;AAiFA;AAAA;AAyiBA;AAAA;AA4IA;AAAA;AAkHA;AAAA;AAiZA;AAAA;AA0HA;AAAA;AA4HA;AAAA;AAiGA;AAAA;AA6OA;AAAA;AA8JA;AAAA;AA8JA;AAAA;AAuIA;AAAA;AA4GA;AAAA;AAuIA;AAAA;AAqJA;AAAA;AA8HA;AAAA;AAkJA;AAAA;AAmPA;AAAA;AAgIA;AAAA;AA+FA;AAAA;AAiGA;AAAA;AAqLA;AAAA;AA4HA;AAAA;AAiLA;AAAA;AA2EA;AAAA;AAkGA;AAAA;AAiqBA;AAAA;AA6KA;AAAA;AAgFA;AAAA;AAoFA;AAAA;AA4MA;AAAA;AA2GA;AAAA;AA4SA;AAAA;AAsbA;AAAA;AAmFA;AAAA;AAmNA;AAAA;AAyIA;AAAA;AAsKA;AAAA;AAqHA;AAAA;AAyGA;AAAA;AAmMA;AAAA;AA0IA;AAAA;AAwHA;AAAA;AA2JA;AAAA;AAgIA;AAAA;AA2MA;AAAA;AAoJA;AAAA;;AAyHA;AA8PA;AAAA;AA4NA;AAAA;AAmHA;AAAA;AAoGA;AAAA;AAkJA;AAAA;AA0FA;AAAA;AA2QA;AAAA;AA+LA;AAAA;AAylBA;AAAA;AA8JA;AAAA;AA4MA;AAAA;AA6UA;AAAA;AAoFA;AAAA;AA8FA;AAAA;AA4FA;AAAA;AAsEA;AAAA;AA2FA;AAAA;;;;;;;AAqJA;AA++DA;AAAA;AAqFA;AAAA;AA4EA;AAAA;AA4GA;AAAA;AA0HA;AAAA;;;;;AAgEA;;AA++KA;AAwJA;AAAA;AAyIA;AAAA;AAoMA;AAAA;AAwIA;AAAA;AAsGA;AAAA;AA0MA;AAAA;AAuLA;AAAA;AAoOA;AAAA;AAyEA;AAAA;AA4GA;AAAA;AAmPA;AAAA;AA4GA;AAAA;AAmKA;AAAA;AA4SA;AAAA;AAmLA;AAAA;AA8LA;AAAA;AA2KA;AAAA;AA4FA;AAAA;AA6FA;AAAA;AAqFA;AAAA;AAmFA;AAAA;AA8EA;AAAA;AA2KA;AAAA;AA+HA;AAAA;;;;;;;;;;;;;;AAkYA;;;;;;;;;AA6vLA;AAq80KA;AAAA;AA8IA;AAAA","sourceRoot":""}

frontend/Skyeye-sys-ui/resource/dt-chart/dt-chart/dist/demo.html

@@ -0,0 +1,10 @@
+<meta charset="utf-8">
+<title>dt-chart demo</title>
+<script src="./dt-chart.umd.js"></script>
+
+<link rel="stylesheet" href="./dt-chart.css">
+
+
+<script>
+console.log(dt-chart)
+</script>

frontend/Skyeye-sys-ui/resource/dt-chart/dt-chart/dist/dt-chart.umd.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dt-chart.umd.min.js","sources":["webpack://dt-chart/dt-chart.umd.min.js"],"mappings":"AAAA;AA+HA;AAAA;AAqEA;AAAA;AA+HA;AAAA;AA0FA;AAAA;AAsNA;AAAA;AAuEA;AAAA;AAiLA;AAAA;AA0HA;AAAA;AAkGA;AAAA;AA4NA;AAAA;AAyFA;AAAA;AAqFA;AAAA;AAyHA;AAAA;AAqEA;AAAA;AAyEA;AAAA;AAiGA;AAAA;AAqQA;AAAA;AAoMA;AAAA;AA8IA;AAAA;AA8HA;AAAA;AAkYA;AAAA;AA2JA;AAAA;AAqMA;AAAA;AA6LA;AAAA;AA8JA;AAAA;AAuMA;AAAA;AA4IA;AAAA;AA8FA;AAAA;AAmKA;AAAA;AAmHA;AAAA;AAwHA;AAAA;AAgFA;AAAA;AAqFA;AAAA;AAyNA;AAAA;AA0IA;AAAA;AAkHA;AAAA;AA4JA;AAAA;AAiRA;AAAA;AAiJA;AAAA;AAsmBA;AAAA;AAiFA;AAAA;AAyiBA;AAAA;AA4IA;AAAA;AAkHA;AAAA;AAiZA;AAAA;AA0HA;AAAA;AA4HA;AAAA;AAiGA;AAAA;AA6OA;AAAA;AA8JA;AAAA;AA8JA;AAAA;AAuIA;AAAA;AA4GA;AAAA;AAuIA;AAAA;AAqJA;AAAA;AA8HA;AAAA;AAkJA;AAAA;AAmPA;AAAA;AAgIA;AAAA;AA+FA;AAAA;AAiGA;AAAA;AAqLA;AAAA;AA4HA;AAAA;AAiLA;AAAA;AA2EA;AAAA;AAkGA;AAAA;AAiqBA;AAAA;AA6KA;AAAA;AAgFA;AAAA;AAoFA;AAAA;AA4MA;AAAA;AA2GA;AAAA;AA4SA;AAAA;AAsbA;AAAA;AAmFA;AAAA;AAmNA;AAAA;AAyIA;AAAA;AAsKA;AAAA;AAqHA;AAAA;AAyGA;AAAA;AAmMA;AAAA;AA0IA;AAAA;AAwHA;AAAA;AA2JA;AAAA;AAgIA;AAAA;AA2MA;AAAA;AAoJA;AAAA;;AAyHA;AA8PA;AAAA;AA4NA;AAAA;AAmHA;AAAA;AAoGA;AAAA;AAkJA;AAAA;AA0FA;AAAA;AA2QA;AAAA;AA+LA;AAAA;AAylBA;AAAA;AA8JA;AAAA;AA4MA;AAAA;AA6UA;AAAA;AAoFA;AAAA;AA8FA;AAAA;AA4FA;AAAA;AAsEA;AAAA;AA2FA;AAAA;;;;;;;AAqJA;AA++DA;AAAA;AAqFA;AAAA;AA4EA;AAAA;AA4GA;AAAA;AA0HA;AAAA;;;;;AAgEA;;AA++KA;AAwJA;AAAA;AAyIA;AAAA;AAoMA;AAAA;AAwIA;AAAA;AAsGA;AAAA;AA0MA;AAAA;AAuLA;AAAA;AAoOA;AAAA;AAyEA;AAAA;AA4GA;AAAA;AAmPA;AAAA;AA4GA;AAAA;AAmKA;AAAA;AA4SA;AAAA;AAmLA;AAAA;AA8LA;AAAA;AA2KA;AAAA;AA4FA;AAAA;AA6FA;AAAA;AAqFA;AAAA;AAmFA;AAAA;AA8EA;AAAA;AA2KA;AAAA;AA+HA;AAAA;;;;;;;;;;;;;;AAkYA;;;;;;;;;AA6vLA;AAq80KA;AAAA;AA8IA;AAAA","sourceRoot":""}

frontend/Skyeye-sys-ui/resource/dt-chart/dt-chart/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "dt-chart",
+  "version": "0.1.0",
+  "private": true,
+  "main": "dist/dt-chart.umd.min.js",
+  "module": "./packages/index.js",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": "dist/dt-chart.umd.min.js",
+      "import": "./packages/index.js"
+    }
+  },
+  "author": {
+    "name": "Farley"
+  },
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "docs": "vuepress dev docs",
+    "docs:build": "vuepress build docs",
+    "build": "vue-cli-service build --target lib packages/index.js & vuepress build docs"
+  },
+  "dependencies": {
+    "core-js": "^3.6.5",
+    "echarts": "^5.1.2",
+    "echarts-gl": "^2.0.8",
+    "echarts-liquidfill": "^3.1.0",
+    "install": "^0.13.0",
+    "moment": "^2.29.1",
+    "nanoid": "^3.1.23",
+    "npm": "^7.20.6",
+    "vue": "^2.6.11",
+    "vue-router": "^3.2.0",
+    "vuepress": "^1.8.2"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.5.0",
+    "@vue/cli-service": "^4.5.0",
+    "sass": "^1.29.0",
+    "sass-loader": "^8.0.2",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
+  ]
+}

frontend/Skyeye-sys-ui/resource/dt-chart/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "dt-chart",
+  "version": "0.1.0",
+  "private": true,
+  "main": "dist/dt-chart.umd.min.js",
+  "module": "./packages/index.js",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": "dist/dt-chart.umd.min.js",
+      "import": "./packages/index.js"
+    }
+  },
+  "author": {
+    "name": "Farley"
+  },
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "docs": "vuepress dev docs",
+    "docs:build": "vuepress build docs",
+    "build": "vue-cli-service build --target lib packages/index.js & vuepress build docs"
+  },
+  "dependencies": {
+    "core-js": "^3.6.5",
+    "echarts": "^5.1.2",
+    "echarts-gl": "^2.0.8",
+    "echarts-liquidfill": "^3.1.0",
+    "install": "^0.13.0",
+    "moment": "^2.29.1",
+    "nanoid": "^3.1.23",
+    "npm": "^7.20.6",
+    "vue": "^2.6.11",
+    "vue-router": "^3.2.0",
+    "vuepress": "^1.8.2"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.5.0",
+    "@vue/cli-service": "^4.5.0",
+    "sass": "^1.29.0",
+    "sass-loader": "^8.0.2",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead"
+  ]
+}