Эх сурвалжийг харах

refactor(national-motion-module-system): 调整开门记录查询接口位置

- 从 AppDeviceController 中移除 listOpenDoor 方法- 在 AppUserController 中添加 listOpenDoor 方法
- 更新相关导入信息
SheepHy 3 долоо хоног өмнө
parent
commit
56d305d722

+ 15 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/AppUserController.java

@@ -15,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 
 import static org.jeecg.modules.app.ezt.GetEidToken.getEidToken;
+import static org.jeecg.modules.hikiot.HikiotTool.queryOpenDoorRecord;
 
 @Slf4j
 @Tag(name = "App用户相关接口")
@@ -93,4 +95,17 @@ public class AppUserController {
                                           @RequestParam("name") @Schema(description = "姓名")String name) throws Exception {
         return Result.ok(getEidToken(idCard,name));
     }
+
+    /**
+     * @Author SheepHy
+     * @Description 分页查询开门记录
+     * @Date 10:53 2025/8/25
+     **/
+    @Operation(summary="分页查询开门记录")
+    @GetMapping(value = "/listOpenDoor")
+    public Result<String> listOpenDoor(@RequestParam String employeeNos,
+                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) throws IOException, InterruptedException {
+        return Result.OK(queryOpenDoorRecord(pageNo, pageSize, employeeNos));
+    }
 }

+ 0 - 15
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppDeviceController.java

@@ -23,7 +23,6 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.Arrays;
 
 import static org.jeecg.modules.hikiot.HikiotTool.*;
@@ -195,18 +194,4 @@ public class AppDeviceController extends JeecgController<AppDevice, IAppDeviceSe
         return super.importExcel(request, response, AppDevice.class);
     }
 
-	/**
-	 * @Author SheepHy
-	 * @Description 分页查询开门记录
-	 * @Date 10:53 2025/8/25
-	 **/
-	@Operation(summary="分页查询开门记录")
-	@GetMapping(value = "/listOpenDoor")
-	public Result<String> listOpenDoor(@RequestParam String employeeNos,
-													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) throws IOException, InterruptedException {
-		return Result.OK(queryOpenDoorRecord(pageNo, pageSize, employeeNos));
-	}
-
-
 }