更新！

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

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.controller.openAPI;
+package com.zhongshu.card.server.core.controller.openAPI.order;
 
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.staticVariable.OpenApiMark;

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

@@ -1,27 +1,19 @@
 package com.zhongshu.card.server.core.controller.openAPI.org;
 
-import com.github.microservice.models.device.DevicePerQuery;
-import com.github.microservice.models.device.UserPerQuery;
-import com.github.microservice.net.ResultContent;
 import com.github.microservice.staticVariable.OpenApiMark;
-import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissIotService;
 import com.zhongshu.card.server.core.service.devices.DeviceUseRecordService;
-import io.swagger.v3.oas.annotations.Operation;
+import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissIotService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
-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;
 
-import javax.validation.Valid;
-
 /**
  * @author TRX
  * @date 2024/6/5
  */
 @RestController
-@RequestMapping("/"+ OpenApiMark.fullCardOpenAPI +"/v1/projectManager")
+@RequestMapping("/" + OpenApiMark.fullCardOpenAPI + "/v1/projectManager")
 @Tag(name = "openAPI-项目管理")
 public class ProjectOpenAPIController {
 
@@ -31,22 +23,4 @@ public class ProjectOpenAPIController {
     @Autowired
     private DeviceUseRecordService deviceUseRecordService;
 
-    @Operation(summary = "查询设备权限", description = "查询设备权限")
-    @RequestMapping(value = "queryDeviceBindUsers", method = {RequestMethod.POST})
-    public ResultContent queryDeviceBindUsers(@RequestBody @Valid DevicePerQuery param) {
-        return devicePermissIotService.queryDevicePermiss(param);
-    }
-
-    @Operation(summary = "查询设备对应的用户信息", description = "查询设备对应的用户信息")
-    @RequestMapping(value = "queryDeviceUsersInfo", method = {RequestMethod.POST})
-    public ResultContent queryDeviceUsersInfo(@RequestBody @Valid DevicePerQuery param) {
-        return devicePermissIotService.getDeviceAboutUserInfos(param);
-    }
-
-    @Operation(summary = "查询设备对应的用户信息", description = "查询设备对应的用户信息")
-    @RequestMapping(value = "queryProjectUsersInfo", method = {RequestMethod.POST})
-    public ResultContent queryProjectUsersInfo(@RequestBody @Valid UserPerQuery param) {
-        return devicePermissIotService.getDeviceAboutUserInfos(param);
-    }
-
 }

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

@@ -10,6 +10,7 @@ import com.zhongshu.card.client.openApi.params.ExpenseFlowOpenApiSearch;
 import com.zhongshu.card.client.openApi.params.PaymentNoParam;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
+import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,9 @@ public class ExpenseFlowOpenApiService extends SuperService {
     @Autowired
     private ExpenseFlowDao expenseFlowDao;
 
+    @Autowired
+    private CommonService commonService;
+
     /**
      * 订单列表
      *
@@ -41,13 +45,13 @@ public class ExpenseFlowOpenApiService extends SuperService {
      * @return
      */
     public ResultContent<Page<ExpenseFlowOpenApiModel>> page(ExpenseFlowOpenApiSearch apiSearch) {
-        if (StringUtils.isEmpty(apiSearch.getProjectCode())) {
-            return ResultContent.buildFail("projectCode不能为空");
-        }
-        String projectOid = getOidByCode(apiSearch.getProjectCode());
-        if (StringUtils.isEmpty(projectOid)) {
-            projectOid = "unKnow";
+        // 检查项目信息
+        ResultContent<String> resultContent = commonService.checkProjectCanUserByCode(apiSearch.getProjectCode());
+        if (resultContent.isFailed()) {
+            return ResultContent.buildFail(resultContent.getMsg());
         }
+        String projectOid = resultContent.getContent();
+
         ExpenseFlowSearch param = new ExpenseFlowSearch();
         BeanUtils.copyProperties(apiSearch, param);
         param.setIsPaySuccess(Boolean.TRUE);