查询分享记录调整 加state字段

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/ShareController.java

@@ -3,10 +3,7 @@ package com.hfln.portal.application.controller.wap;
 import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
 import com.hfln.portal.common.dto.data.share.ShareDto;
-import com.hfln.portal.common.request.share.ShareConfirmParam;
-import com.hfln.portal.common.request.share.ShareParam;
-import com.hfln.portal.common.request.share.UrlShareConfirmParam;
-import com.hfln.portal.common.request.share.updateShareParam;
+import com.hfln.portal.common.request.share.*;
 import com.hfln.portal.domain.gateway.DeviceGateway;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,10 +37,10 @@ public class ShareController {
         return ApiResult.success();
     }
 
-    @GetMapping("/queryDevShare")
+    @PostMapping("/queryDevShare")
     @Operation(summary = "查看设备分享记录")
-    public ApiResult<List<ShareDto>> queryDevShare(@RequestParam Long userId) {
-        return ApiResult.success(deviceGateway.queryDevShare(userId));
+    public ApiResult<List<ShareDto>> queryDevShare(@RequestBody @Valid QueryDevShareParam param) {
+        return ApiResult.success(deviceGateway.queryDevShare(param));
     }
 
     @PostMapping("/shareByUrl")

portal-service-common/src/main/java/com/hfln/portal/common/request/share/QueryDevShareParam.java

@@ -0,0 +1,22 @@
+package com.hfln.portal.common.request.share;
+
+import com.hfln.portal.common.vo.BaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "查询设备分享")
+@Data
+public class QueryDevShareParam extends BaseVO {
+
+    @Schema(description = "用户id")
+    @NotNull
+    private  Long userId;
+
+    @Schema(description = "处理状态: NULL-查全部, 0-查待确认, 1-查确认, 2-查拒绝")
+    private Integer state;
+}

portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/DeviceGateway.java

@@ -6,10 +6,7 @@ import com.hfln.portal.common.dto.data.room.RoomDTO;
 import com.hfln.portal.common.dto.data.share.ShareDto;
 import com.hfln.portal.common.request.device.*;
 import com.hfln.portal.common.request.room.RoomParam;
-import com.hfln.portal.common.request.share.ShareConfirmParam;
-import com.hfln.portal.common.request.share.ShareParam;
-import com.hfln.portal.common.request.share.UrlShareConfirmParam;
-import com.hfln.portal.common.request.share.updateShareParam;
+import com.hfln.portal.common.request.share.*;
 import com.hfln.portal.common.response.device.UsedInfoQueryRes;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -66,7 +63,7 @@ public interface DeviceGateway {
 
     void urlShareConfirm (UrlShareConfirmParam param);
 
-    List<ShareDto> queryDevShare(Long userId);
+    List<ShareDto> queryDevShare(QueryDevShareParam param);
 
     void shareConfirm(ShareConfirmParam shareConfirmParam);
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/DeviceGatewayImpl.java

@@ -23,10 +23,7 @@ import com.hfln.portal.common.dto.data.share.ShareDto;
 import com.hfln.portal.common.request.device.*;
 import com.hfln.portal.common.request.room.RoomParam;
 import com.hfln.portal.common.request.room.SubRegionInfo;
-import com.hfln.portal.common.request.share.ShareConfirmParam;
-import com.hfln.portal.common.request.share.ShareParam;
-import com.hfln.portal.common.request.share.UrlShareConfirmParam;
-import com.hfln.portal.common.request.share.updateShareParam;
+import com.hfln.portal.common.request.share.*;
 import com.hfln.portal.common.response.device.UsedInfoQueryRes;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.domain.customer.OprLogType;
@@ -751,9 +748,9 @@ public class DeviceGatewayImpl implements DeviceGateway {
     }
 
     @Override
-    public List<ShareDto> queryDevShare(Long userId) {
+    public List<ShareDto> queryDevShare(QueryDevShareParam param) {
 
-        List<DevShare> shares = devShareService.queryBySharedUserId(userId);
+        List<DevShare> shares = devShareService.queryBySharedUserId(param.getUserId(), param.getState());
         if (CollectionUtils.isEmpty(shares)) {
             return null;
         }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/DevShareService.java

@@ -18,7 +18,7 @@ public interface DevShareService extends IService<DevShare> {
 
     DevShare queryNotDeal(Long sharerUserId, Long sharedUserId, Long devId);
 
-    List<DevShare> queryBySharedUserId(Long sharedUserId);
+    List<DevShare> queryBySharedUserId(Long sharedUserId, Integer state);
 
     List<DevShare> queryConfirmedByDevId(Long devId);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevShareServiceImpl.java

@@ -80,9 +80,16 @@ public class DevShareServiceImpl extends ServiceImpl<DevShareMapper, DevShare> i
     }
 
     @Override
-    public List<DevShare> queryBySharedUserId(Long sharedUserId) {
+    public List<DevShare> queryBySharedUserId(Long sharedUserId, Integer state) {
+        if (state == null) {
+            LambdaQueryWrapper<DevShare> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(DevShare::getSharedUserId, sharedUserId);
+            wrapper.eq(DevShare::getIsDeleted, 0);
+            return this.baseMapper.selectList(wrapper);
+        }
         LambdaQueryWrapper<DevShare> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(DevShare::getSharedUserId, sharedUserId);
+        wrapper.eq(DevShare::getState, state);
         wrapper.eq(DevShare::getIsDeleted, 0);
         return this.baseMapper.selectList(wrapper);
     }