From 24ae61a8e5d301451d13185e88ec64377274e3e1 Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Thu, 12 Feb 2026 19:25:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=87=BA=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/device/service/DeviceInfoService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java index 0238995..46a35b7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java @@ -441,6 +441,9 @@ public class DeviceInfoService extends ServiceImpl Date: Fri, 6 Mar 2026 13:44:50 +0800 Subject: [PATCH 2/4] 1 --- .../com/njzscloud/supervisory/hsoa/service/HsoaService.java | 3 ++- .../njzscloud/supervisory/order/service/OrderInfoService.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java index 2215efb..8bd86f2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java @@ -47,6 +47,7 @@ public class HsoaService extends ServiceImpl implements public HsoaResult pushProvincialSave(OrderPagingResult detail) { log.info("上传数据：{}", Jackson.toJsonStr(detail)); + List route = detail.getRoute(); PushProvincialSaveParam param = new PushProvincialSaveParam() .setHandleInfo(new PushProvincialSaveParam.HandleInfo() .setApproveDate(detail.getOutTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) @@ -144,7 +145,7 @@ public class HsoaService extends ServiceImpl implements .setLicenseValidityPeriodDateRange(detail.getShiAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "-" + detail.getShiAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) .setLicenseValidityPeriodStartDate(detail.getShiAuditTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) .setLicenseValidityPeriodEndDate(detail.getShiAuditTime().plusHours(24).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - // .setRoute("") + .setRoute(CollUtil.isEmpty(route) ? "" : String.join("-", route)) .setSuperviseUnitName(detail.getAreaName()) .setTransportDateRange(detail.getTransTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "-" + detail.getOutTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) .setTransportStartDate(detail.getTransTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index f22efeb..844ac24 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -1387,6 +1387,8 @@ public class OrderInfoService extends ServiceImpl routes = baseMapper.getRoute(orderId); + detail.setRoute(routes); CompletableFuture.runAsync(() -> { HsoaResult result = hsoaService.pushProvincialSave(detail); HsoaRecode hsoaRecode = new HsoaRecode() @@ -2324,6 +2326,8 @@ public class OrderInfoService extends ServiceImpllambdaQuery().eq(OrderInfoEntity::getSn, orderSn)); Long orderId = orderInfo.getId(); OrderPagingResult detail = this.detail(orderId); + List routes = baseMapper.getRoute(orderId); + detail.setRoute(routes); HsoaResult hsoaResult = hsoaService.pushProvincialSave(detail); list.add(MapUtil.builder() .put("result", hsoaResult) From b9154f900d6076922b8827dfb5e68d8bf58b0630 Mon Sep 17 00:00:00 2001 From: lzq <2495532633@qq.com> Date: Fri, 6 Mar 2026 14:16:42 +0800 Subject: [PATCH 3/4] 1 --- .../controller/DeviceInfoController.java | 4 ++-- .../device/service/DeviceInfoService.java | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java index 133d4cd..cc6deb4 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/controller/DeviceInfoController.java @@ -120,7 +120,7 @@ public class DeviceInfoController { } /** - * 上报1 + * 上报1,识别时调用 */ @PostMapping("/report1") public Map report1(@RequestBody JSONObject data) { @@ -128,7 +128,7 @@ public class DeviceInfoController { } /** - * 上报2 + * 上报2，称重完调用 */ @PostMapping("/report2") public Map report2(@RequestBody JSONObject data) { diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java index 46a35b7..7a8cc11 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java @@ -202,10 +202,20 @@ public class DeviceInfoService extends ServiceImpl paging(PageParam pageParam, DeviceInfoEntity deviceInfoEntity) { return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(deviceInfoEntity))); } + private void open(String sn, String cid) { + log.info("开门: {} {}", sn, cid); + Mqtt.publish(cid + "/1/barrier", MapUtil.builder() + .put("deviceNo", sn) + .build()); + } + + + @Transactional(rollbackFor = Exception.class) public Map report1(JSONObject data) { MapBuilder resBuilder = MapUtil.builder() @@ -336,13 +346,6 @@ public class DeviceInfoService extends ServiceImpl report2(JSONObject data) { MapBuilder resBuilder = MapUtil.builder() @@ -513,6 +516,7 @@ public class DeviceInfoService extends ServiceImpl Date: Fri, 6 Mar 2026 16:55:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=AF=E9=87=8D=E5=A4=8D=E6=8E=A5?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervisory/biz/service/BizDriverService.java | 2 +- .../supervisory/biz/service/BizTruckService.java | 2 +- .../supervisory/order/mapper/OrderInfoMapper.java | 4 ++++ .../supervisory/order/service/OrderInfoService.java | 13 ++++++++++--- .../main/resources/mapper/order/OrderInfoMapper.xml | 12 ++++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java index 7fc76a6..bafe565 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java @@ -174,7 +174,7 @@ public class BizDriverService extends ServiceImpllambdaQuery() - .eq(BizDriverEntity::getBusy, false) + // .eq(BizDriverEntity::getBusy, false) .eq(BizDriverEntity::getCompanyId, searchCompanyResult.getId()) .eq(BizDriverEntity::getAuditStatus, AuditStatus.TongGuo) .and(StrUtil.isNotBlank(keywords), it -> diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java index b31a1fc..1378bed 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java @@ -188,7 +188,7 @@ public class BizTruckService extends ServiceImpl SearchCompanyResult searchCompanyResult = baseMapper.selectCompanyByUserId(userDetail.getUserId()); Assert.notNull(searchCompanyResult, () -> Exceptions.exception("未查询到公司信息")); return PageResult.of(this.page(pageParam.toPage(), Wrappers.lambdaQuery() - .eq(BizTruckEntity::getBusy, false) + // .eq(BizTruckEntity::getBusy, false) .eq(BizTruckEntity::getAuditStatus, AuditStatus.TongGuo) .eq(BizTruckEntity::getCompanyId, searchCompanyResult.getId()) .and(StrUtil.isNotBlank(keywords), it -> diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java index 57d285d..ba62f2d 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java @@ -56,4 +56,8 @@ public interface OrderInfoMapper extends BaseMapper { @SuppressWarnings("MybatisXMapperMethodInspection") List> statisticsByAreaGoods(@Param("ew") QueryWrapper ew); + + Boolean driverIsBusy(@Param("driverId") Long driverId); + + Boolean truckIsBusy(@Param("truckId") Long truckId); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 844ac24..d436091 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -786,7 +786,7 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("您没有权限确认此单")); - baseMapper.busyTruck(truckId, Boolean.TRUE); + // baseMapper.busyTruck(truckId, Boolean.TRUE); OrderCargoPlaceEntity cargoPlaceEntity = orderCargoPlaceService.getById(orderInfo.getCargoPlaceId()); String area = cargoPlaceEntity.getArea(); BizAuditConfigEntity bizAuditConfigEntity = bizAuditConfigService.getOne(Wrappers.lambdaQuery(BizAuditConfigEntity.class).eq(BizAuditConfigEntity::getArea, area)); @@ -937,6 +937,12 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("订单不存在")); Assert.isTrue(orderInfo.getOrderStatus() == OrderStatus.YiJieDan, () -> Exceptions.clierr("当前订单状态，无法开始运输")); Assert.isTrue(orderInfo.getAuditStatus() == AuditStatus.TongGuo, () -> Exceptions.clierr("当前订单未审核完成，无法开始运输")); + Long truckId = orderInfo.getTruckId(); + Long driverId = orderInfo.getDriverId(); + Boolean driverIsBusy = baseMapper.driverIsBusy(driverId); + Assert.isFalse(driverIsBusy, () -> Exceptions.exception("有未完成的订单，不能清运")); + Boolean truckIsBusy = baseMapper.truckIsBusy(truckId); + Assert.isFalse(truckIsBusy, () -> Exceptions.exception("有未完成的订单，不能清运")); Long orderInfoId = orderInfo.getId(); OrderGoodsEntity entity = orderGoodsService.getById(orderInfo.getGoodsId()); @@ -948,6 +954,8 @@ public class OrderInfoService extends ServiceImpl Exceptions.clierr("订单未分配车辆")); BizTruckEntity truckInfo = baseMapper.getTruckInfo(truckId); Assert.notNull(truckInfo, () -> Exceptions.clierr("车辆不存在")); diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml index da9a37b..1a2c5bc 100644 --- a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -400,4 +400,16 @@ INNER JOIN goods_info t2 ON t2.id = t1.goods_id INNER JOIN sys_district t3 ON t3.id = t1.area_code + +