更新！

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/params/DeviceIdParam.java

@@ -0,0 +1,21 @@
+package com.zhongshu.card.client.openApi.params;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.checkerframework.checker.units.qual.N;
+
+/**
+ * @author TRX
+ * @date 2024/11/12
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceIdParam {
+
+    @Schema(description = "设备ID")
+    private String deviceId;
+
+}

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/params/DeviceInfoOpenApiSearch.java

@@ -0,0 +1,31 @@
+package com.zhongshu.card.client.openApi.params;
+
+import com.github.microservice.models.type.DeviceType;
+import com.zhongshu.card.client.openApi.base.SuperOpenAPIParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/11/12
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceInfoOpenApiSearch extends SuperOpenAPIParam {
+
+    @Schema(description = "关键字搜索")
+    private String keyWord;
+
+    @Schema(description = "设备ID")
+    private String deviceId;
+
+    @Schema(description = "设备名称")
+    private String deviceName;
+
+    @Schema(description = "设备类型，如 消费机 门禁机")
+    private DeviceType deviceType;
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/DevicePermissOpenApiController.java

@@ -0,0 +1,44 @@
+package com.zhongshu.card.server.core.controller.openAPI;
+
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.openApi.model.DeviceInfoOpenApiModel;
+import com.zhongshu.card.client.openApi.params.DeviceInfoOpenApiSearch;
+import com.zhongshu.card.server.core.service.openAPI.DevicePermissOpenApiService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author TRX
+ * @date 2024/6/5
+ */
+@RestController
+@RequestMapping("/openAPI/v1/devicePermiss")
+@Tag(name = "openAPI-设备权限管理")
+public class DevicePermissOpenApiController {
+
+    @Autowired
+    private DevicePermissOpenApiService devicePermissOpenApiService;
+
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "设备列表-分页查询", description = "设备列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<DeviceInfoOpenApiModel>> page(@RequestBody DeviceInfoOpenApiSearch param) {
+        return devicePermissOpenApiService.page(param);
+    }
+
+//    @ResourceAuth(value = "user", type = AuthType.User)
+//    @Operation(summary = "订单详情", description = "订单详情")
+//    @RequestMapping(value = {"getDetailByPaymentNo"}, method = {RequestMethod.POST})
+//    public ResultContent<ExpenseFlowOpenApiModel> getDetailByPaymentNo(@RequestBody PaymentNoParam param) {
+//        return expenseFlowOpenApiService.getDetailByPaymentNo(param);
+//    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ExpenseFlowOpenApiController.java

@@ -41,7 +41,7 @@ public class ExpenseFlowOpenApiController {
     private ExpenseFlowOpenApiService expenseFlowOpenApiService;
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "消费列表-分页查询", description = "消费列表-分页查询")
+    @Operation(summary = "订单列表-分页查询", description = "订单列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
     public ResultContent<Page<ExpenseFlowOpenApiModel>> page(@RequestBody ExpenseFlowOpenApiSearch param) {
         return expenseFlowOpenApiService.page(param);

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/DevicePermissOpenApiService.java

@@ -2,21 +2,15 @@ package com.zhongshu.card.server.core.service.openAPI;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
-import com.github.microservice.types.OrderModeType;
-import com.github.microservice.types.OrderState;
-import com.zhongshu.card.client.model.devices.DeviceInfoModel;
 import com.zhongshu.card.client.model.devices.DeviceInfoSearch;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
-import com.zhongshu.card.client.model.payment.ExpenseFlowSearch;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.openApi.model.DeviceInfoOpenApiModel;
-import com.zhongshu.card.client.openApi.model.ExpenseFlowOpenApiModel;
-import com.zhongshu.card.client.openApi.params.ExpenseFlowOpenApiSearch;
-import com.zhongshu.card.client.openApi.params.PaymentNoParam;
+import com.zhongshu.card.client.openApi.params.DeviceIdParam;
+import com.zhongshu.card.client.openApi.params.DeviceInfoOpenApiSearch;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
-import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
 import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;
@@ -67,18 +61,27 @@ public class DevicePermissOpenApiService extends SuperService {
      * @param apiSearch
      * @return
      */
-    public ResultContent<Page<DeviceInfoOpenApiModel>> page(ExpenseFlowOpenApiSearch apiSearch) {
+    public ResultContent<Page<DeviceInfoOpenApiModel>> page(DeviceInfoOpenApiSearch apiSearch) {
         if (StringUtils.isEmpty(apiSearch.getProjectCode())) {
             return ResultContent.buildFail("projectCode不能为空");
         }
         DeviceInfoSearch param = new DeviceInfoSearch();
-
+        BeanUtils.copyProperties(apiSearch, param);
+        param.setProjectInfoCode(apiSearch.getProjectCode());
 
         Pageable pageable = PageRequest.of(apiSearch.getNumber(), apiSearch.getSize());
         Page<DeviceInfo> page = deviceInfoDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }
 
+//    public ResultContent getDetailByDeviceId(DeviceIdParam param) {
+//        DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(param.getDeviceId());
+//        if () {
+//
+//        }
+//
+//    }
+
     /**
      * 设备基础信息
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -717,7 +717,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     public ResultContent<ExpenseFlowAreaModel> getDetail(String id) {
         ExpenseFlow entity = expenseFlowDao.findTopById(id);
         if (ObjectUtils.isEmpty(entity)) {
-            return ResultContent.buildSuccess(String.format(ResultMessage.DATA_NOT_EXIST, id));
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
         }
         ExpenseFlowAreaModel model = toAreaModel(entity);
         return ResultContent.buildSuccess(model);
@@ -732,7 +732,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     public ResultContent<ExpenseFlowAreaModel> getDetailByPaymentNo(String paymentNo) {
         ExpenseFlow entity = expenseFlowDao.findTopByPaymentNo(paymentNo);
         if (ObjectUtils.isEmpty(entity)) {
-            return ResultContent.buildSuccess(String.format(ResultMessage.DATA_NOT_EXIST, paymentNo));
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, paymentNo));
         }
         ExpenseFlowModel model = toAreaModel(entity);
         return ResultContent.buildSuccess(model);