diff --git a/admin/src/main/java/com/multictrl/modules/business/handler/OsdHandler.java b/admin/src/main/java/com/multictrl/modules/business/handler/OsdHandler.java index f982db8..f2d36db 100644 --- a/admin/src/main/java/com/multictrl/modules/business/handler/OsdHandler.java +++ b/admin/src/main/java/com/multictrl/modules/business/handler/OsdHandler.java @@ -43,7 +43,7 @@ public class OsdHandler implements MessageHandler { if (gateway.equals(dockSn)) { // log.debug("dock osd --> topic: {}, payload: {}", topic, payload); if (data.containsKey("network_state")) {//网络状态,机库osd分3次上报信息,只有网络状态对程序有用,其他前端展示即可 - CacheUtils.set(BusinessConstant.DOCK_OSD + dockSn, data); + CacheUtils.set(BusinessConstant.DOCK_OSD + dockSn, data, 1000 * 5); //判断飞行结束,从“任务中”切到“空闲“ if (data.containsKey("mode_code")) { int modeCode = data.getInt("mode_code", -1); diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java index c1521c0..5b741ce 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/FlightTaskServiceImpl.java @@ -302,7 +302,7 @@ public class FlightTaskServiceImpl extends CrudServiceImpl SELECT * FROM bus_flight_task - WHERE create_date > (SELECT create_date FROM uav_route_task WHERE task_id = #{param1}) + WHERE create_date > (SELECT create_date FROM bus_flight_task WHERE task_id = #{param1}) and dock_sn = #{param2} diff --git a/prj-deploy/docker-compose.yml b/prj-deploy/docker-compose.yml index 41aa356..1b8ff2d 100644 --- a/prj-deploy/docker-compose.yml +++ b/prj-deploy/docker-compose.yml @@ -26,7 +26,7 @@ services: - /root/dj_multictrl_data/nginx/cert:/etc/nginx/cert - /root/dj_multictrl_data/nginx/html:/usr/share/nginx/html - /data/dj_multictrl_data/minio/data:/data - - /data/dj_multictrl_data/live_record:/live_record + - /data/dj_multictrl_data/live_record:/data/live_record - /data/dj_multictrl_data/geoserver:/data/geoserver - /etc/localtime:/etc/localtime:ro diff --git a/prj-deploy/file/nginx/nginx.conf b/prj-deploy/file/nginx/nginx.conf index 5f521f6..42c8e64 100644 --- a/prj-deploy/file/nginx/nginx.conf +++ b/prj-deploy/file/nginx/nginx.conf @@ -36,12 +36,12 @@ http { proxy_pass http://dj-multictrl-api:8080/api/; } - location ~* /live_record/(.+)$ { - add_header Access-Control-Allow-Origin *; - add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; - add_header Access-Control-Allow-Headers 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization'; - alias /live_record/$1; - } + #location ~* /live_record/(.+)$ { + # add_header Access-Control-Allow-Origin *; + # add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; + # add_header Access-Control-Allow-Headers 'DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization'; + # alias /live_record/$1; + #} location ~* /video/(.+)$ { add_header Access-Control-Allow-Origin *;