Merge branch 'refs/heads/main' into dev_20260130_RemoveRedis

README.md

@@ -110,3 +110,29 @@ npx update-browserslist-db@latest
 ```
 ## 4. 在浏览器中打开主页，localhost:8080, 默认用户名密码为：admin/123
 
+# 前端nginx启动
+
+## 1.执行build
+PS D:\IdeaProjects\skyeyesystem\frontend\Skyeye-sys-ui> npm run build
+
+出现错误的执行
+PS D:\IdeaProjects\skyeyesystem\frontend\Skyeye-sys-ui> npm install babel-plugin-transform-remove-console --save-dev
+
+出现版本node.js太大问题
+1.降低版本
+2."scripts": {
+"serve": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
+"build": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build",
+"lint": "vue-cli-service lint"
+}
+
+## 2. 拷贝resource目录中的dt-sdk到node-modules目录
+
+## 3.继续build
+PS D:\IdeaProjects\skyeyesystem\frontend\Skyeye-sys-ui> npm run build
+
+## 4.然后到nginx-conf目录下修改配置文件nginx.conf的启动路径
+root   "D:/IdeaProjects/skyeyesystem/frontend/Skyeye-sys-ui/dist";
+
+## 5.回到nginx目录下cmd 执行.\nginx.exe
+

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

@@ -25,6 +25,7 @@ import com.zhangy.skyeye.kmz.KmzGen;
 import com.zhangy.skyeye.publics.consts.ExecStatusEnum;
 import com.zhangy.skyeye.publics.consts.FileTypeEnum;
 import com.zhangy.skyeye.publics.consts.UavAirlineUploadEnum;
+import com.zhangy.skyeye.publics.consts.WebSocketKey;
 import com.zhangy.skyeye.publics.service.SysFileTypeService;
 import com.zhangy.skyeye.publics.utils.CoordUtil;
 import com.zhangy.skyeye.py.service.IPyAirlineService;
@@ -39,6 +40,7 @@ import com.zhangy.skyeye.sar.service.ISarMtiPointService;
 import com.zhangy.skyeye.sar.service.ISarMtiTrailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -82,6 +84,8 @@ public class JmJobServiceImpl implements JmJobService {
     private QuartzService quartzService;
     @Autowired
     private JmAirlinePlanService jmAirlinePlanService;
+    @Autowired
+    private SimpMessagingTemplate simpMessagingTemplate;
 
     @Override
     public IPage<JmJobDTO> selectPage(JmJobPageDTO param) {
@@ -454,6 +458,12 @@ public class JmJobServiceImpl implements JmJobService {
             sarControlService.sendUdp(controlParam);
             // 标记缓存状态，确保断连重新发送请求时不会重复执行
             //  uav.setSarStatus(ExecStatusEnum.OVER);
+
+            // 只会通知一次？
+            // 通知前端任务停止
+            JmJobStatusWsDTO wsVo = new JmJobStatusWsDTO(id, uav.getUavId());
+            wsVo.setJobStatus(ExecStatusEnum.OVER.getValue());
+            simpMessagingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
         });
         // 删除缓存任务信息
         jobStatusService.remove(id);

frontend/Skyeye-sys-ui/src/views/home/components/twin-situation/index.js

@@ -1587,7 +1587,15 @@ export default {
             // info.status = 2
             this.getTaskList()
             this.$message.success('任务已结束！')
+            this.detailUav.id = ''
+            this.detailUav.visible = false
             this.removeTaskTarget(info.id)
+            let entitys = [...viewer.entities.values]
+            entitys.forEach(item => {
+              if (item.id.includes(info.id)) {
+                viewer.entities.remove(item)
+              }
+            })
           } else {
             this.$message.error(res.data.message)
           }
@@ -3014,19 +3022,26 @@ export default {
         // 从执行中变为执行完毕
         if (this.taskList.data[findIndex].status === 1 && data.jobStatus === 2) {
           // 移除任务相关信息
-          // console.log('任务变更', this.jobStatus, this.jobStatus[data.jobStatus + ''])
-          // this.taskList.data[findIndex].statusName = this.jobStatus[data.jobStatus + '']
-          // taskListResource[findIndex].statusName = this.jobStatus[data.jobStatus + '']
           taskListResource.splice(findIndex, 1)
           this.getTaskList()
           this.removeTaskTarget(data.jobId)
+          this.detailUav.chart.data[0].data = []
+          this.detailUav.chart.data[1].data = []
+          this.detailUav.chart.data[2].data = []
+          this.detailUav.chart.data[3].data = []
+          this.detailUav.id = ''
+          this.detailUav.visible = false
+          let entitys = [...viewer.entities.values]
+          entitys.forEach(item => {
+            if (item.id.includes(data.jobId)) {
+              viewer.entities.remove(item)
+            }
+          })
         }
         if (data.jobStatus === 1 && this.detailUav.id === data.jobId) {
           this.updateUavInfo(data.sarStatus)
         }
         this.taskList.data[findIndex].status = data.jobStatus
-        taskListResource[findIndex].status = data.jobStatus
-        console.log('整体状态变更1', findIndex, this.taskList.data[findIndex])
       }
     },
 
@@ -3082,6 +3097,12 @@ export default {
     //#endregion
     // 打开状态和波形信息展示
     openSarStatusDetail(data) {
+      let entitys = [...viewer.entities.values]
+      entitys.forEach(item => {
+        if (item.id.includes(this.detailUav.id)) {
+          viewer.entities.remove(item)
+        }
+      })
       this.detailUav.chart.data[0].data = []
       this.detailUav.chart.data[1].data = []
       this.detailUav.chart.data[2].data = []