opt:1.修改远程下发任务限制.2.巡航模式下限制接收配送任务。3.优化国际化。4.站点按照名称排序。

nl-business-map/src/main/java/org/nl/map/controller/MapInfoController.java

@@ -5,9 +5,7 @@ import org.nl.logging.annotation.Log;
 import org.nl.map.service.MapService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author dsh
@@ -25,4 +23,10 @@ public class MapInfoController {
     public ResponseEntity<Object> queryCurrentMapInfo() {
         return new ResponseEntity<>(mapService.queryCurrentMapInfo(), HttpStatus.OK);
     }
+
+    @PostMapping("/syncCurrentMapData")
+    @Log("同步当前地图最新数据")
+    public ResponseEntity<Object> syncCurrentMapData() {
+        return new ResponseEntity<>(null,HttpStatus.OK);
+    }
 }

nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java

@@ -1,6 +1,7 @@
 package org.nl.map.provider;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.api.map.api.MapAPI;
@@ -31,7 +32,7 @@ public class MapAPIProvider implements MapAPI {
 
     @Override
     public List<Map<String, Object>> getAllStationList() {
-        List<Station> stations = mapStationService.list();
+        List<Station> stations = mapStationService.list(new LambdaQueryWrapper<>(Station.class).orderByAsc(Station::getStation_name));
         return stations.stream()
                 .map(station -> BeanUtil.beanToMap(station, false, true))
                 .collect(Collectors.toList());

nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/impl/QRCodeServiceImpl.java

@@ -157,11 +157,6 @@ public class QRCodeServiceImpl implements QRCodeService {
         if (taskAPI.queryTaskInfoByDestination(qrCodeTaskRequestParam.getDestinations())){
             throw new BadRequestException(LangProcess.msg("qrcode_create_failed_exists_task"));
         }
-        String mode = settingAPI.querySettingParamByCode("mode").getJSONObject("data").getString("value");
-        // 判断是否在巡航模式 再巡航模式不能下发二维码任务
-        if ("1".equals(mode)){
-            throw new BadRequestException(LangProcess.msg("qrcode_create_failed_mode"));
-        }
 
         return taskAPI.createTask(qrCodeTaskRequestParam, TaskSourceEnum.QRCODE.getName());
     }

nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java

@@ -9,9 +9,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.api.setting.api.SettingAPI;
 import org.nl.api.task.api.TaskAPI;
 import org.nl.api.task.core.OneClickOperationRequestParam;
 import org.nl.api.task.core.TaskRequestParam;
+import org.nl.config.language.LangProcess;
+import org.nl.exception.BadRequestException;
 import org.nl.response.WebResponse;
 import org.nl.task.entity.Task;
 import org.nl.enums.TaskSourceEnum;
@@ -36,6 +39,9 @@ public class TaskAPIProvider implements TaskAPI {
     @Resource
     private TaskService taskService;
 
+    @Resource
+    private SettingAPI settingAPI;
+
     @Override
     public Task queryCurrentTaskByVehicleNumber(String vehicleNumber) {
         List<Task> taskList = taskService.queryCurrentTaskInfoByVehicleNumber(vehicleNumber);
@@ -75,6 +81,16 @@ public class TaskAPIProvider implements TaskAPI {
 
     @Override
     public WebResponse createTask(TaskRequestParam taskRequestParam,String taskSource) {
+        String mode = settingAPI.querySettingParamByCode("mode").getJSONObject("data").getString("value");
+        String far_call = settingAPI.querySettingParamByCode("far_call").getJSONObject("data").getString("is_active");
+        // 判断是否在巡航模式 再巡航模式不能下发配送任务
+        if ("1".equals(mode)){
+            throw new BadRequestException(LangProcess.msg("qrcode_create_failed_mode"));
+        }
+        // 判断是否开启了远程呼叫 关闭后无法进行远程呼叫任务
+        if ("0".equals(far_call)){
+            throw new BadRequestException(LangProcess.msg("qrcode_create_failed_far_call"));
+        }
         CreateTaskRequestParam param = BeanUtil.toBean(taskRequestParam, CreateTaskRequestParam.class);
         return taskService.createTask(param, taskSource);
     }

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

@@ -110,6 +110,7 @@ qrcode_delete_file_failed = 删除二维码文件失败
 qrcode_delete_failed = 删除二维码失败
 qrcode_station_code_empty = 站号不能为空
 qrcode_create_failed_mode = 巡航模式中,无法下发任务
+qrcode_create_failed_far_call = 远程呼叫功能未开启,无法下发任务
 qrcode_create_failed_exists_task = 该目标点已存在任务
 
 # 安全相关
@@ -120,3 +121,25 @@ system_get_menu_failed = 获取对应的系统菜单出错
 
 # 通用
 unsupported_format = 不支持的压缩格式: {0}
+
+# 验证注解相关
+validation_task_type_empty = 任务类型不能为空
+validation_destinations_empty = 目标点不能为空
+validation_password_empty = 密码不能为空
+validation_location_empty = 点位不能为空
+validation_vehicle_number_empty = 车号不能为空
+validation_qrcode_id_empty = 二维码标识不能为空
+validation_old_room_empty = 旧房间号不能为空
+validation_new_room_empty = 新房间号不能为空
+validation_qrcode_data_empty = 二维码数据不能为空
+validation_qrcode_width_empty = 二维码宽度不能为空
+validation_qrcode_height_empty = 二维码高度不能为空
+validation_room_empty = 房间号不能为空
+validation_page_num_empty = 页码不能为空
+validation_page_size_empty = 每页条数不能为空
+validation_schedule_task_code_empty = 调度任务号不能为空
+validation_schedule_one_click_type_empty = 调度一键任务类型不能为空
+validation_speed_empty = 速度不能为空
+validation_role_name_empty = 角色名称不能为空
+validation_dept_name_empty = 部门名称不能为空
+validation_dept_is_used_empty = 部门状态不能为空

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

@@ -110,6 +110,7 @@ qrcode_delete_file_failed = Failed to delete QR code file
 qrcode_delete_failed = Failed to delete QR code
 qrcode_station_code_empty = Station code cannot be empty
 qrcode_create_failed_mode = In cruise mode, cannot create task
+qrcode_create_failed_far_call = The remote call function is not enabled, and tasks cannot be dispatched
 qrcode_create_failed_exists_task = Task already exists for this destination
 
 # Security related