add:1.增加后台管理强制取消任务接口。2.修改设置车辆冰量和水量逻辑。3.增加OTA远程更新功能。4.补充国际化。5.增加调度任务不存在同步取消数据库任务。

nl-web-app/src/main/resources/config/application-prod.yml

@@ -77,6 +77,10 @@ file:
     path: /home/pi/nl_robot/map/
     qrcode: /home/pi/nl_robot/qrcode/
     avatar: /home/pi/nl_robot/avatar/
+# docker 模式用以下路径
+#    path: /app/data/file/
+#    qrcode: /app/data/qrcode/
+#    avatar: /app/data/avatar/
   windows:
     path: C:\eladmin\file\currentMap\
     qrcode: C:\eladmin\qrcode\

nl-web-app/src/main/resources/config/application.yml

@@ -48,6 +48,7 @@ security:
     - /schedule/setting/**
     - /external/api/**
     - /task/**
+    - /api/otaAgent/**
     - /mapinfo/**
     - /security/**
     - /mapMonitor/**

nl-web-app/src/main/resources/language/buss/buss.properties

@@ -34,6 +34,7 @@ setting_charge_call_value_empty = 修改充电时是否可呼叫,设置值和是
 setting_usable_task_failed = 设置调度可接任务阈值失败
 setting_update_failed = 更新设置失败:{0}
 setting_volume_failed = 更新音量失败
+setting_thresholds_failed = 更新水量和电量阈值失败
 
 # 任务相关
 task_type_not_exist = 任务类型不存在
@@ -142,4 +143,10 @@ validation_schedule_one_click_type_empty = 调度一键任务类型不能为空
 validation_speed_empty = 速度不能为空
 validation_role_name_empty = 角色名称不能为空
 validation_dept_name_empty = 部门名称不能为空
-validation_dept_is_used_empty = 部门状态不能为空
+validation_dept_is_used_empty = 部门状态不能为空
+
+# otaAgent相关
+otaAgentGetStatusFailed = 检测更新失败
+otaAgentConfirmFailed = 确认更新失败
+otaAgentPostponeFailed = 推迟更新通知失败
+otaAgentConfirmCheckFailed = 升级条件不满足:电量不能低于50,当前不能存在任务

nl-web-app/src/main/resources/language/buss/buss_en_US.properties

@@ -34,6 +34,7 @@ setting_charge_call_value_empty = Modify charge call, setting value and enable v
 setting_usable_task_failed = Failed to set schedule usable task threshold
 setting_update_failed = Failed to update setting: {0}
 setting_volume_failed = Failed to update volume
+setting_thresholds_failed = Failing to update water and battery thresholds
 
 # Task related
 task_type_not_exist = Task type does not exist
@@ -143,3 +144,9 @@ validation_speed_empty = Speed cannot be empty
 validation_role_name_empty = Role name cannot be empty
 validation_dept_name_empty = Department name cannot be empty
 validation_dept_is_used_empty = Department status cannot be empty
+
+# otaAgent相关
+otaAgentGetStatusFailed = Detection update failed
+otaAgentConfirmFailed = Confirm that the update failed
+otaAgentPostponeFailed = Delay update notifications fail
+otaAgentConfirmCheckFailed = Upgrade conditions are not met: The battery cannot be less than 50, and there are currently no missions

nl-web-app/src/main/resources/language/buss/buss_zh_CN.properties

@@ -34,6 +34,7 @@ setting_charge_call_value_empty = 修改充电时是否可呼叫,设置值和是
 setting_usable_task_failed = 设置调度可接任务阈值失败
 setting_update_failed = 更新设置失败:{0}
 setting_volume_failed = 更新音量失败
+setting_thresholds_failed = 更新水量和电量阈值失败
 
 # 任务相关
 task_type_not_exist = 任务类型不存在
@@ -143,3 +144,9 @@ validation_speed_empty = 速度不能为空
 validation_role_name_empty = 角色名称不能为空
 validation_dept_name_empty = 部门名称不能为空
 validation_dept_is_used_empty = 部门状态不能为空
+
+# otaAgent相关
+otaAgentGetStatusFailed = 检测更新失败
+otaAgentConfirmFailed = 确认更新失败
+otaAgentPostponeFailed = 推迟更新通知失败
+otaAgentConfirmCheckFailed = 升级条件不满足:电量不能低于50,当前不能存在任务