From bbd09035a89ac4c458d5391e6ed9b8fb41a13639 Mon Sep 17 00:00:00 2001 From: liejiu946 Date: Thu, 19 Mar 2026 10:03:17 +0800 Subject: [PATCH] =?UTF-8?q?opt:1.=E4=BF=AE=E6=94=B9=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1=E9=99=90=E5=88=B6.2.?= =?UTF-8?q?=E5=B7=A1=E8=88=AA=E6=A8=A1=E5=BC=8F=E4=B8=8B=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=85=8D=E9=80=81=E4=BB=BB=E5=8A=A1=E3=80=82?= =?UTF-8?q?3.=E4=BC=98=E5=8C=96=E5=9B=BD=E9=99=85=E5=8C=96=E3=80=824.?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=8C=89=E7=85=A7=E5=90=8D=E7=A7=B0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/map/controller/MapInfoController.java | 10 +++++--- .../org/nl/map/provider/MapAPIProvider.java | 3 ++- .../service/impl/QRCodeServiceImpl.java | 5 ---- .../org/nl/task/provider/TaskAPIProvider.java | 16 ++++++++++++ .../resources/language/buss/buss.properties | 23 ++++++++++++++++++ .../language/buss/buss_en_US.properties | 1 + .../language/buss/buss_zh_CN.properties | Bin 170 -> 6030 bytes 7 files changed, 49 insertions(+), 9 deletions(-) diff --git a/nl-business-map/src/main/java/org/nl/map/controller/MapInfoController.java b/nl-business-map/src/main/java/org/nl/map/controller/MapInfoController.java index a561a89..4d483fe 100644 --- a/nl-business-map/src/main/java/org/nl/map/controller/MapInfoController.java +++ b/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 queryCurrentMapInfo() { return new ResponseEntity<>(mapService.queryCurrentMapInfo(), HttpStatus.OK); } + + @PostMapping("/syncCurrentMapData") + @Log("同步当前地图最新数据") + public ResponseEntity syncCurrentMapData() { + return new ResponseEntity<>(null,HttpStatus.OK); + } } diff --git a/nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java b/nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java index 168eeb9..4047273 100644 --- a/nl-business-map/src/main/java/org/nl/map/provider/MapAPIProvider.java +++ b/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> getAllStationList() { - List stations = mapStationService.list(); + List stations = mapStationService.list(new LambdaQueryWrapper<>(Station.class).orderByAsc(Station::getStation_name)); return stations.stream() .map(station -> BeanUtil.beanToMap(station, false, true)) .collect(Collectors.toList()); diff --git a/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/impl/QRCodeServiceImpl.java b/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/impl/QRCodeServiceImpl.java index edf71f1..bf1fdf5 100644 --- a/nl-business-sys/src/main/java/org/nl/sys/modular/qrcode/service/impl/QRCodeServiceImpl.java +++ b/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()); } diff --git a/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java b/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java index 623220e..8d65568 100644 --- a/nl-business-task/src/main/java/org/nl/task/provider/TaskAPIProvider.java +++ b/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 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); } diff --git a/nl-web-app/src/main/resources/language/buss/buss.properties b/nl-web-app/src/main/resources/language/buss/buss.properties index 1892ba5..e731ab5 100644 --- a/nl-web-app/src/main/resources/language/buss/buss.properties +++ b/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 = 部门状态不能为空 \ No newline at end of file diff --git a/nl-web-app/src/main/resources/language/buss/buss_en_US.properties b/nl-web-app/src/main/resources/language/buss/buss_en_US.properties index 983a6ed..a8e1be1 100644 --- a/nl-web-app/src/main/resources/language/buss/buss_en_US.properties +++ b/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 diff --git a/nl-web-app/src/main/resources/language/buss/buss_zh_CN.properties b/nl-web-app/src/main/resources/language/buss/buss_zh_CN.properties index 46d1cb2eec7a2a5704b148f6ed28fbf66eb2d22f..ea15b36885a454425f150b5546c67c87809a571f 100644 GIT binary patch literal 6030 zcmb7I%~Bgl62A9Sn3(HC%$^;w53sjA@5V+)yVXJ+BXw*0$2POE5yG~N0Ly~04A^K4 zngxULTEYe+83}k9Rdx4iUtzNG|c)CBQR5j0V znNl+P5==UDYe;(yx^W!5eKx1mHAkzdrmI?hm1!iMC-n94Yp7_mS z2R?_V?@4DwTN`BfJlI`~x^KeaP*Hxk7al()=kJ5L9_zdNAoRC72S7eR2R#bAMKKyJV z59sa^R6#Mut{VC1hr??PAodI^StD#3L76b6FG86O+>|MjPT%bY*NHqVJ;w~HXa2ta$H9JzCx zhFEnOk4-*-gh)(6F6qd0LL2q<{ko z`4{ChOE;=XbVz4|p0$c~)-~USITsJSBt&nYki{PQo<^eAh{_44#S*6-!(|j(U}5oh zve&-Jf`BC^xOA}zpg1;XvhykU_$E&pJUD{eSXMR1F(1a{giOd-@$wSc{71UEOHW=S zYvBixGo&@dYpFmB_fQ8XJ5gQSvSmE>)Yw;fFvQHptE97z(mZyeE_BB?AwL`+?=Xmv zlaO`es2{eD1Q$aklj##O9?!1&ba5!^nS)i+D%)&HN_|)GOGUFvRkp!pM9AK=VC^|7 zQZ&o1Y1IX_3|kr>3$9T$bdLux9FC&KGF|;ZH62sY#1sWUU<>h-ED+ zT(+H>27M=16<8d|a+`FHXm?0oEdK2;f2F%qGVNqRu%|(+WMspG|Il}9!csyC@iFoo zfzia*i^W(7&`ym7rzlUc{vUDCEJR^g*Wbc3+ci5DRo*qVK@zT3=5{CX0a-SD3(D5ge*8ekkf|Eg3)J%%U3j4g)Vhm5JPQ9Ji%lgEWsK~*0;!L z|9{gLkOtCh!NH?9d-x~HFh9trP0}34ewaEN&upJ#)W$U9_rC*g{sR_mL2V@_mu5he z0yonFRqX-rjnu?;yib?KnpD{FYNqQ#zp}V(?vmCnI14*FZ4c;gPop<$aE|m6I>%Rq zPLH%-3+HQw<*U9^RcpTMsTI$wGxzs4qF0yXsu}esv&laD_x?{m!KNQJn(T)QzsR&f z_D&U!zk3px4xSB&H1sKCiKn&kHrUx09zldm9h)K^6|h_Z=|Tg_Sj{Oy%w^XiS*9oj z-48d3q~dUw7wYi>!qdfa0iB^&;K;BS!DbVeOe0)671yC$V)>OQmkub1@Zi^Q`HL{& z*sQ73EsCGx7EN~iIVB|<7mpN%@{!fUGY2aRZHfF$>6(g;pl}!QC|FkPf;RdR zUM07x1hP0A^Au)L@sTr%A$ha&7s2EdVkRQ{ zPlqQR)*?;be54F^S6nFUYODx($F^(v3sVAXT}7Lx`6()p^M=K4Ybm}BaK(uo6SbT+ zBpHG=2P%)5Mj91UH(F}Lc7Q4~&Z3T(Jdwm%(!Q$^lNIYKW`F4gj=byIH|ZcpHG19C!esy(31pYr{LM6M1Eu z4yIE+7Dzr3-mqCVSSHPQrn-jiJEpgAy+89!6P!$f$&Tn4cfs|HnmTU)p|XJ@lN7!j z!NyF6-^h6vC?7!~A3!kPfpTK{?;a|?<@$B@FaXa)xU+!sP!71Ku+jW-HJEkYQYgtzab-(3Dl~HK^`qe3 zBc(ll^7#IXObR4w^^V<^0y2u`d={St_*k$^?)@hPvW!PL(8lq1LBhp5lWoeLfIc!y zUgbKSkiiAKBxdO3I<{h%^A*^Q^IQ~t+`0vvjZ7i4r%cuPqmf^eR-*pb)ULrtNM0OQ zV&N4Xb^t+{#xWP4CjD0wI36`$d-%(d|5>`4u_1&<$9Q~x>pbSTt}8&P+VyEYZp zH$D!&Jcf9NA|Rc^kP2kw0mXB{tW+Rf08~@Spuk`Y#E~Ua vlTSrNO>U2sW0{=W5gQRWIk&P+OqGiPyO}9KQ$YIhnYnJNrs10mY-R!gZ80n9