feat:柜子设备信息生成

db/800pjcloudx_hardware.sql

@@ -35,6 +35,37 @@ CREATE TABLE hard_manager
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci COMMENT ='设备管理';
 
+-- ----------------------------
+-- Table structure for hard_door_manager
+-- ----------------------------
+DROP TABLE IF EXISTS `hard_door_manager`;
+CREATE TABLE hard_door_manager
+(
+    id                      bigint      NOT NULL COMMENT '编号',
+    hard_id                 bigint      NOT NULL COMMENT '设备编号',
+    imei                    varchar(32) NOT NULL COMMENT '设备 IMEI 号(15 位)',
+    cabinet_num             int                                    DEFAULT NULL COMMENT '货柜数量',
+    cabinet_camera_num      int                                    DEFAULT NULL COMMENT '每个货柜中摄像头数量',
+    cabinet_weight_unit_num int                                    DEFAULT NULL COMMENT '每个货柜中称重单元数量',
+    power_status            int                                    DEFAULT NULL COMMENT '1：通电；2：断电',
+    net_status              int                                    DEFAULT NULL COMMENT '在线状态。1：在线；2：离线',
+    sale_status             int                                    DEFAULT NULL COMMENT '售卖状态。1：在售；2：停售',
+    signal_intensity        int                                    DEFAULT NULL COMMENT 'sim 信号强度。大于-95 表示信号强度好；-95 到-105 表示信号强度中等；小于-105 表示信号差；',
+    signal_ratio            int                                    DEFAULT NULL COMMENT '信噪比，体现信道传输质量的参数。大于 15 表示质量好；15 到 0 表示质量中等；小于等于 0 表示质量差；',
+    signal_time             int                                    DEFAULT NULL COMMENT 'sim 信号值更新时间。yyyy-MM-dd HH:mm:ss',
+    cabinet_list            text                                   DEFAULT NULL COMMENT '货柜列表JSON',
+    restart_time            datetime                               DEFAULT NULL COMMENT '上次重启时间',
+    create_by               varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    create_time             datetime                               DEFAULT NULL COMMENT '创建时间',
+    update_by               varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
+    update_time             datetime                               DEFAULT NULL COMMENT '修改时间',
+    del_flag                char(1) COLLATE utf8mb4_general_ci     DEFAULT '0' COMMENT '删除标记',
+    tenant_id               bigint                                 DEFAULT NULL COMMENT '租户ID',
+    PRIMARY KEY (id)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='柜子设备管理';
+
 -- ----------------------------
 -- Table structure for hard_group
 -- ----------------------------

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/manager/HardDoorManagerDto.java

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.hard.api.dto.manager;
+
+import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity;
+import lombok.Data;
+
+@Data
+public class HardDoorManagerDto extends HardDoorManagerEntity {
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/manager/HardManagerDto.java

@@ -1,6 +1,6 @@
-package com.bsd.pjcloud.hard.api.dto;
+package com.bsd.pjcloud.hard.api.dto.manager;
 
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import lombok.Data;
 
 import java.util.List;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardDoorManagerEntity.java

@@ -0,0 +1,154 @@
+package com.bsd.pjcloud.hard.api.entity.manager;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import com.bsd.pjcloud.common.core.util.TenantTable;
+
+import java.time.LocalDateTime;
+
+/**
+ * 智能柜设置
+ *
+ * @author dzc
+ * @date 2025-04-08 18:50:53
+ */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@TenantTable
+@TableName("hard_door_manager")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "智能柜设置")
+public class HardDoorManagerEntity extends Model<HardDoorManagerEntity> {
+
+
+    /**
+     * 编号
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "编号")
+    private Long id;
+
+    /**
+     * 设备编号
+     */
+    @Schema(description = "设备编号")
+    private Long hardId;
+
+    /**
+     * 设备 IMEI 号(15 位)
+     */
+    @Schema(description = "设备 IMEI 号(15 位)")
+    private String imei;
+
+    /**
+     * 货柜数量
+     */
+    @Schema(description = "货柜数量")
+    private Integer cabinetNum;
+
+    /**
+     * 每个货柜中摄像头数量
+     */
+    @Schema(description = "每个货柜中摄像头数量")
+    private Integer cabinetCameraNum;
+
+    /**
+     * 每个货柜中称重单元数量
+     */
+    @Schema(description = "每个货柜中称重单元数量")
+    private Integer cabinetWeightUnitNum;
+
+    /**
+     * 1：通电；2：断电
+     */
+    @Schema(description = "1：通电；2：断电")
+    private Integer powerStatus;
+
+    /**
+     * 在线状态。1：在线；2：离线
+     */
+    @Schema(description = "在线状态。1：在线；2：离线")
+    private Integer netStatus;
+
+    /**
+     * 售卖状态。1：在售；2：停售
+     */
+    @Schema(description = "售卖状态。1：在售；2：停售")
+    private Integer saleStatus;
+
+    /**
+     * sim 信号强度。大于-95 表示信号强度好；-95 到-105 表示信号强度中等；小于-105 表示信号差；
+     */
+    @Schema(description = "sim 信号强度。大于-95 表示信号强度好；-95 到-105 表示信号强度中等；小于-105 表示信号差；")
+    private Integer signalIntensity;
+
+    /**
+     * 信噪比，体现信道传输质量的参数。大于 15 表示质量好；15 到 0 表示质量中等；小于等于 0 表示质量差；
+     */
+    @Schema(description = "信噪比，体现信道传输质量的参数。大于 15 表示质量好；15 到 0 表示质量中等；小于等于 0 表示质量差；")
+    private Integer signalRatio;
+
+    /**
+     * sim 信号值更新时间。yyyy-MM-dd HH:mm:ss
+     */
+    @Schema(description = "sim 信号值更新时间。yyyy-MM-dd HH:mm:ss")
+    private Integer signalTime;
+
+    /**
+     * 货柜列表JSON
+     */
+    @Schema(description = "货柜列表JSON")
+    private String cabinetList;
+
+    /**
+     * 上次重启时间
+     */
+    @Schema(description = "上次重启时间")
+    private LocalDateTime restartTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改人")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description = "修改时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标记
+     */
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "删除标记")
+    private String delFlag;
+
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
+    private Long tenantId;
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/manager/HardManagerEntity.java

@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.hard.api.entity;
+package com.bsd.pjcloud.hard.api.entity.manager;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/HardUtil.java

@@ -6,7 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.hard.api.dto.code.QRCodeDto;
 import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.vo.base.BaseHardGroupInterface;
 import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardDoorManagerVo.java

@@ -0,0 +1,15 @@
+package com.bsd.pjcloud.hard.api.vo.manager;
+
+import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity;
+import lombok.Data;
+
+@Data
+public class HardDoorManagerVo extends HardDoorManagerEntity {
+    /**
+     * 硬件设备相关
+     */
+    private String hardName;
+
+    private String hardType;
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/manager/HardManagerVo.java

@@ -1,7 +1,7 @@
-package com.bsd.pjcloud.hard.api.vo;
+package com.bsd.pjcloud.hard.api.vo.manager;
 
 import com.bsd.pjcloud.admin.api.vo.base.BaseDeptInterface;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.vo.base.BaseHardGroupInterface;
 import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java

@@ -9,7 +9,7 @@ import com.bsd.pjcloud.hard.api.dto.hard.HandCancelCodeDto;
 import com.bsd.pjcloud.hard.api.dto.hard.HardBindDto;
 import com.bsd.pjcloud.hard.api.dto.hard.HardCreateOrderDto;
 import com.bsd.pjcloud.hard.api.vo.HardInvoiceVo;
-import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
+import com.bsd.pjcloud.hard.api.vo.manager.HardManagerVo;
 import com.bsd.pjcloud.hard.api.vo.android.HardAdUserVo;
 import com.bsd.pjcloud.hard.api.vo.order.HardCarVo;
 import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardDoorManagerController.java

@@ -0,0 +1,91 @@
+package com.bsd.pjcloud.hard.controller.manager;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.hard.api.dto.manager.HardDoorManagerDto;
+import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity;
+import com.bsd.pjcloud.hard.service.HardDoorManagerService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 智能柜设置
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/hard-door-manager")
+@Tag(description = "hard-door-manager", name = "智能柜设置管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class HardDoorManagerController {
+
+    private final HardDoorManagerService hardDoorManagerService;
+
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("/page")
+    @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_view')")
+    public R getHardDoorManagerPage(@ParameterObject Page page, @ParameterObject HardDoorManagerEntity hardDoorManager) {
+        LambdaQueryWrapper<HardDoorManagerEntity> wrapper = Wrappers.lambdaQuery();
+        return R.ok(hardDoorManagerService.page(page, wrapper));
+    }
+
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("/page-join")
+    @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_view')")
+    public R pageJoin(@ParameterObject Page page, @ParameterObject HardDoorManagerDto dto) {
+        DataScope dataScope = new DataScope();
+        return R.ok(hardDoorManagerService.scopePageJoin(page, dto, dataScope));
+    }
+
+    @Operation(summary = "通过id查询", description = "通过id查询")
+    @GetMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_view')")
+    public R getById(@PathVariable("id") Long id) {
+        return R.ok(hardDoorManagerService.getById(id));
+    }
+
+    @Operation(summary = "新增智能柜设置", description = "新增智能柜设置")
+    @SysLog("新增智能柜设置")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_add')")
+    public R save(@RequestBody HardDoorManagerEntity hardDoorManager) {
+        return R.ok(hardDoorManagerService.save(hardDoorManager));
+    }
+
+    @Operation(summary = "修改智能柜设置", description = "修改智能柜设置")
+    @SysLog("修改智能柜设置")
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_edit')")
+    public R updateById(@RequestBody HardDoorManagerEntity hardDoorManager) {
+        return R.ok(hardDoorManagerService.updateById(hardDoorManager));
+    }
+
+    @Operation(summary = "通过id删除智能柜设置", description = "通过id删除智能柜设置")
+    @SysLog("通过id删除智能柜设置")
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_del')")
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(hardDoorManagerService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('hard_hardDoorManager_export')")
+    public List<HardDoorManagerEntity> export(HardDoorManagerEntity hardDoorManager, Long[] ids) {
+        return hardDoorManagerService.list(Wrappers.lambdaQuery(hardDoorManager).in(ArrayUtil.isNotEmpty(ids), HardDoorManagerEntity::getId, ids));
+    }
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/manager/HardManagerController.java

@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.hard.controller;
+package com.bsd.pjcloud.hard.controller.manager;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -9,9 +9,8 @@ import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
-import com.bsd.pjcloud.hard.api.dto.HardInvoiceDto;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.service.HardManagerService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/manager/HardDoorManagerMapper.java

@@ -0,0 +1,17 @@
+package com.bsd.pjcloud.hard.mapper.manager;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.hard.api.dto.manager.HardDoorManagerDto;
+import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity;
+import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface HardDoorManagerMapper extends PjcloudBaseMapper<HardDoorManagerEntity> {
+
+    Page<HardDoorManagerVo> scopePageJoin(Page page, @Param("dto") HardDoorManagerDto dto, DataScope dataScope);
+
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/manager/HardManagerMapper.java

@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.hard.mapper;
+package com.bsd.pjcloud.hard.mapper.manager;
 
 import cn.hutool.core.util.ObjectUtil;
 
@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
-import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.vo.manager.HardManagerVo;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 
 import org.apache.ibatis.annotations.Mapper;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java

@@ -4,12 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderSumAndCountDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.vo.order.*;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardDoorManagerService.java

@@ -0,0 +1,14 @@
+package com.bsd.pjcloud.hard.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.hard.api.dto.manager.HardDoorManagerDto;
+import com.bsd.pjcloud.hard.api.entity.manager.HardDoorManagerEntity;
+import com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo;
+
+public interface HardDoorManagerService extends IService<HardDoorManagerEntity> {
+
+    Page<HardDoorManagerVo> scopePageJoin(Page page, HardDoorManagerDto dto, DataScope dataScope);
+
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardManagerService.java

@@ -3,11 +3,11 @@ package com.bsd.pjcloud.hard.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
 import com.bsd.pjcloud.hard.api.dto.hard.CurrentUserHardTypeInfoDto;
 import com.bsd.pjcloud.hard.api.dto.hard.HardBindDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
-import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.vo.manager.HardManagerVo;
 
 import java.util.List;
 

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java

@@ -24,14 +24,14 @@ import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
 import com.bsd.pjcloud.hard.api.dto.HardInvoiceDto;
 import com.bsd.pjcloud.hard.api.entity.HardInvoiceEntity;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.utils.Drawing2D;
 import com.bsd.pjcloud.hard.api.vo.HardInvoiceVo;
-import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
+import com.bsd.pjcloud.hard.api.vo.manager.HardManagerVo;
 import com.bsd.pjcloud.hard.mapper.HardInvoiceMapper;
-import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
+import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper;
 import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
 import com.bsd.pjcloud.hard.service.HardCarService;
 import com.bsd.pjcloud.hard.service.HardInvoiceService;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardDoorManagerServiceImpl.java

@@ -0,0 +1,23 @@
+package com.bsd.pjcloud.hard.service.impl.manager;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.hard.api.dto.manager.HardDoorManagerDto;
+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 org.springframework.stereotype.Service;
+
+/**
+ * 智能柜设置
+ */
+@Service
+public class HardDoorManagerServiceImpl extends ServiceImpl<HardDoorManagerMapper, HardDoorManagerEntity> implements HardDoorManagerService {
+
+    @Override
+    public Page<HardDoorManagerVo> scopePageJoin(Page page, HardDoorManagerDto dto, DataScope dataScope) {
+        return baseMapper.scopePageJoin(page, dto, dataScope);
+    }
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/manager/HardManagerServiceImpl.java

@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.hard.service.impl;
+package com.bsd.pjcloud.hard.service.impl.manager;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
@@ -17,15 +17,15 @@ import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
 import com.bsd.pjcloud.hard.api.dto.hard.CurrentUserHardTypeInfoDto;
 import com.bsd.pjcloud.hard.api.dto.hard.HardBindDto;
 import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.utils.HardUtil;
-import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
+import com.bsd.pjcloud.hard.api.vo.manager.HardManagerVo;
 import com.bsd.pjcloud.hard.mapper.HardGroupMapper;
-import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
+import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper;
 import com.bsd.pjcloud.hard.service.HardManagerService;
 import com.bsd.pjcloud.hard.mqtt.config.MqttConfig;
 import com.bsd.pjcloud.hard.utils.MqTopicUtil;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java

@@ -23,20 +23,20 @@ import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
 import com.bsd.pjcloud.hard.api.dto.hard.HandCancelCodeDto;
 import com.bsd.pjcloud.hard.api.dto.hard.HardCreateOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardCreateCarDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity;
 import com.bsd.pjcloud.hard.api.utils.HardUtil;
 import com.bsd.pjcloud.hard.api.vo.order.HardCarVo;
 import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;
-import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
+import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper;
 import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
 import com.bsd.pjcloud.hard.service.HardCarService;
 import com.bsd.pjcloud.hard.service.HardInvoiceService;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java

@@ -14,15 +14,15 @@ import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
 import com.bsd.pjcloud.hard.api.dto.hard.CurrentUserHardTypeInfoDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardDeptTotalDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderSumAndCountDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.utils.HardUtil;
 import com.bsd.pjcloud.hard.api.vo.order.*;
-import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
+import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper;
 import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
 import com.bsd.pjcloud.hard.service.HardManagerService;
 import com.bsd.pjcloud.hard.service.HardOrderTotalService;
@@ -35,11 +35,8 @@ import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import com.bsd.pjcloud.wallet.api.vo.WalletTransactionSumAndCountVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.jcajce.provider.util.SecretKeyUtil;
-import org.springframework.security.concurrent.DelegatingSecurityContextExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.context.request.RequestContextHolder;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuCategoryServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.hard.api.dto.spu.HardSpuCategoryDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuCategoryEntity;
 import com.bsd.pjcloud.hard.api.vo.spu.HardSpuCategoryVo;
 import com.bsd.pjcloud.hard.mapper.spu.HardSpuCategoryMapper;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuRepertoryServiceImpl.java

@@ -12,14 +12,14 @@ import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.constant.spu.SpuRepertoryTypeEnum;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
 import com.bsd.pjcloud.hard.api.dto.spu.HardSpuRepertoryDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity;
 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuRepertoryEntity;
 import com.bsd.pjcloud.hard.api.utils.HardUtil;
 import com.bsd.pjcloud.hard.api.vo.spu.HardSpuRepertoryVo;
-import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
+import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper;
 import com.bsd.pjcloud.hard.mapper.spu.HardSpuRepertoryMapper;
 import com.bsd.pjcloud.hard.service.HardSpuRepertoryService;
 import com.bsd.pjcloud.hard.service.HardSpuService;

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java

@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
+import com.bsd.pjcloud.hard.api.dto.manager.HardManagerDto;
 import com.bsd.pjcloud.hard.api.dto.spu.HardSpuDto;
-import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuEntity;
 import com.bsd.pjcloud.hard.api.utils.HardUtil;
-import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
+import com.bsd.pjcloud.hard.api.vo.manager.HardManagerVo;
 import com.bsd.pjcloud.hard.api.vo.spu.HardSpuVo;
-import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
+import com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper;
 import com.bsd.pjcloud.hard.mapper.spu.HardSpuMapper;
 import com.bsd.pjcloud.hard.service.HardManagerService;
 import com.bsd.pjcloud.hard.service.HardSpuService;

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bsd.pjcloud.hard.mapper.manager.HardDoorManagerMapper">
+    <resultMap id="hardDoorManagerMap" type="com.bsd.pjcloud.hard.api.dto.manager.HardDoorManagerDto">
+        <id property="id" column="id"/>
+        <result property="hardId" column="hard_id"/>
+        <result property="imei" column="imei"/>
+        <result property="cabinetNum" column="cabinet_num"/>
+        <result property="cabinetCameraNum" column="cabinet_camera_num"/>
+        <result property="cabinetWeightUnitNum" column="cabinet_weight_unit_num"/>
+        <result property="powerStatus" column="power_status"/>
+        <result property="netStatus" column="net_status"/>
+        <result property="saleStatus" column="sale_status"/>
+        <result property="signalIntensity" column="signal_intensity"/>
+        <result property="signalRatio" column="signal_ratio"/>
+        <result property="signalTime" column="signal_time"/>
+        <result property="cabinetList" column="cabinet_list"/>
+        <result property="restartTime" column="restart_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+    </resultMap>
+
+    <sql id="selectA">
+        select a.id,
+               a.hard_id,
+               a.imei,
+               a.cabinet_num,
+               a.cabinet_camera_num,
+               a.cabinet_weight_unit_num,
+               a.power_status,
+               a.net_status,
+               a.sale_status,
+               a.signal_intensity,
+               a.signal_ratio,
+               a.signal_time,
+               a.cabinet_list,
+               a.restart_time,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               a.del_flag,
+               a.tenant_id,
+    </sql>
+
+    <sql id="whereA">
+        a.del_flag = '0'
+        <if test="dto.hard_id != null">
+            and a.hard_id = #{dto.hardId}
+        </if>
+        <if test="dto.imei != null and dto.imei != '' ">
+            and a.imei like concat('%', #{dto.imei}, '%')
+        </if>
+        <if test="dto.power_status != null">
+            and a.power_status = #{dto.powerStatus}
+        </if>
+        <if test="dto.net_status != null">
+            and a.net_status = #{dto.netStatus}
+        </if>
+        <if test="dto.sale_status != null">
+            and a.sale_status = #{dto.saleStatus}
+        </if>
+    </sql>
+
+    <select id="scopePageJoin" resultType="com.bsd.pjcloud.hard.api.vo.manager.HardDoorManagerVo">
+        <include refid="selectA"/>
+        m.name as hardName,
+        m.type as hardType
+        from hard_door_manager a
+        left join hard_manager m on m.id = a.hard_id
+        <where>
+            <include refid="whereA"/>
+        </where>
+        order by a.create_time desc , a.id desc
+    </select>
+</mapper>

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardManagerMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bsd.pjcloud.hard.mapper.HardManagerMapper">
-    <resultMap id="hardManagerMap" type="com.bsd.pjcloud.hard.api.entity.HardManagerEntity">
+<mapper namespace="com.bsd.pjcloud.hard.mapper.manager.HardManagerMapper">
+    <resultMap id="hardManagerMap" type="com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity">
         <id property="id" column="id"/>
         <result property="merchantId" column="merchant_id"/>
         <result property="deptId" column="dept_id"/>