diff --git a/db/800pjcloudx_hardware.sql b/db/800pjcloudx_hardware.sql index daa561236..8e9aac8bb 100644 --- a/db/800pjcloudx_hardware.sql +++ b/db/800pjcloudx_hardware.sql @@ -44,6 +44,7 @@ CREATE TABLE hard_door_manager id bigint NOT NULL COMMENT '编号', hard_id bigint NOT NULL COMMENT '设备编号', imei varchar(32) NOT NULL COMMENT '设备 IMEI 号(15 位)', + device_code int DEFAULT NULL COMMENT '设备编号', cabinet_num int DEFAULT NULL COMMENT '货柜数量', cabinet_camera_num int DEFAULT NULL COMMENT '每个货柜中摄像头数量', cabinet_weight_unit_num int DEFAULT NULL COMMENT '每个货柜中称重单元数量', diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java index ffe7283e9..91f6f2c6c 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java @@ -38,6 +38,12 @@ public class HardDoorManagerEntity extends Model { @Schema(description = "设备编号") private Long hardId; + /** + * 内置设备编号 + */ + @Schema(description = "内置设备编号") + private String deviceCode; + /** * 设备 IMEI 号(15 位) */ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java index 4dda3afe9..ee178d2e0 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java @@ -42,6 +42,7 @@ public class HardDoorManagerController { @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_add')") public R bind(@RequestBody HardDoorManagerEntity dto) { if (ObjectUtil.isEmpty(dto.getImei())) throw new RuntimeException("设备IMEI卡号不能为空"); + if (ObjectUtil.isEmpty(dto.getDeviceCode())) throw new RuntimeException("设备内置设备编号不能为空"); hardDoorManagerService.bind(dto); return R.ok(); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java index f4bfdeed2..46ea99c0e 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java @@ -1,5 +1,6 @@ package com.bsd.pjcloud.hard.service.impl.manager; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.data.datascope.DataScope; @@ -8,14 +9,27 @@ import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity; import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo; import com.bsd.pjcloud.hard.mapper.manager.HardDoorManagerMapper; import com.bsd.pjcloud.hard.service.HardDoorManagerService; +import com.bsd.pjcloud.thirdparty.api.feign.RemoterThirdDoorApiService; +import com.bsd.pjcloud.thirdparty.dto.door.DoorBindDto; +import com.bsd.pjcloud.thirdparty.dto.door.DoorRegisterDto; +import com.bsd.pjcloud.thirdparty.vo.door.DoorBindVo; +import com.bsd.pjcloud.thirdparty.vo.door.DoorRegisterVo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; /** * 智能柜设置 */ +@Validated +@Slf4j +@RequiredArgsConstructor @Service public class HardDoorManagerServiceImpl extends ServiceImpl implements HardDoorManagerService { + private final RemoterThirdDoorApiService thirdDoorApiService; + @Override public Page scopePageJoin(Page page, HardDoorManagerDto dto, DataScope dataScope) { return baseMapper.scopePageJoin(page, dto, dataScope); @@ -34,10 +48,38 @@ public class HardDoorManagerServiceImpl extends ServiceImpl + @@ -29,6 +30,7 @@ select a.id, a.hard_id, a.imei, + a.device_code, a.cabinet_num, a.cabinet_camera_num, a.cabinet_weight_unit_num, @@ -56,6 +58,9 @@ and a.imei like concat('%', #{dto.imei}, '%') + + and a.device_code like concat('%', #{dto.deviceCode}, '%') + and a.power_status = #{dto.powerStatus} diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index 34afa65fa..a54048415 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -251,7 +251,7 @@ - group by DATE_FORMAT(a.create_time, '%Y-%d-%m') + group by DATE_FORMAT(a.create_time, '%Y-%m-%d')