From e962da405b001f09e2d8ba4fac13595882d534a7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 15 Apr 2025 17:09:00 +0800
Subject: [PATCH] 11

---
 .../pjcloud/hard/api/dto/HardAuthAppDto.java  | 19 +++++++++++++++++++
 .../hard/api/entity/HardAuthEntity.java       | 10 ++++++----
 .../hard/controller/HardAuthController.java   |  4 ++++
 .../service/impl/HardAuthServiceImpl.java     |  3 +++
 .../main/resources/mapper/SysUserMapper.xml   |  1 +
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java
index 570ad93d5..e3a4a09a0 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthAppDto.java
@@ -1,7 +1,26 @@
 package com.bsd.pjcloud.hard.api.dto;
 
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 @Data
 public class HardAuthAppDto {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 智能柜设备id
+     */
+    @NotEmpty(message = "智能柜设备id不能为空")
+    private Long doorHardId;
+
+    /**
+     * 是否授权
+     */
+    @NotEmpty(message = "是否授权不能为空")
+    private String authStatus;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java
index 22742289a..9e0dbdd3e 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java
@@ -3,8 +3,7 @@ package com.bsd.pjcloud.hard.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import com.bsd.pjcloud.common.core.util.TenantTable;
 
 import java.time.LocalDateTime;
@@ -12,6 +11,9 @@ import java.time.LocalDateTime;
 /**
  * 硬件授权
  */
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @Data
 @TenantTable
 @TableName("hard_auth")
@@ -40,9 +42,9 @@ public class HardAuthEntity extends Model<HardAuthEntity> {
     private Long hardId;
 
     /**
-     * 是否授权
+     * 授权类型
      */
-    @Schema(description = "是否授权")
+    @Schema(description = "授权类型")
     private String authType;
 
     /**
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java
index fd10e637c..8e478be9d 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardAuthController.java
@@ -7,6 +7,8 @@ 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.common.security.service.PjcloudUser;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.hard.api.dto.HardAuthAppDto;
 import com.bsd.pjcloud.hard.api.dto.HardAuthDto;
 import com.bsd.pjcloud.hard.api.entity.HardAuthEntity;
@@ -42,6 +44,8 @@ public class HardAuthController {
     @PostMapping("/app/auth-hard-door")
     @PreAuthorize("@pms.hasPermission('hard_hardAuth_view')")
     public R appAuthHardDoor(@RequestBody HardAuthAppDto dto) {
+        PjcloudUser user = SecurityUtils.getUser();
+        dto.setUserId(user.getId());
         return R.ok(hardAuthService.appAuthHardDoor(dto));
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
index 5615bee7c..7a2b60def 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
@@ -52,6 +52,9 @@ public class HardAuthServiceImpl extends ServiceImpl<HardAuthMapper, HardAuthEnt
      */
     @Override
     public Long appAuthHardDoor(HardAuthAppDto dto) {
+        HardAuthEntity insetObj = HardAuthEntity.builder()
+                .userId(dto.getUserId())
+                .build();
         return 0L;
     }
 
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index 201249c47..41a60a494 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -231,6 +231,7 @@
                 </foreach>
             </if>
         </where>
+        group by u.user_id
         <if test="_databaseId != 'mssql'">
             ORDER BY u.create_time DESC, u.user_id DESC
         </if>