From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/controller/OpenController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ab2c05a..115fa8d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -276,6 +277,9 @@
public R list(@RequestHeader(required = false) String appkey, @RequestBody(required = false) LocMast param) {
auth(appkey, param, request);
LocMast locMast = locMastService.selectById(param.getLocNo());
+ if (locMast == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
HashMap<String, Object> map = new HashMap<>();
map.put("status", locMast.getLocSts());
@@ -283,6 +287,14 @@
return R.ok(map);
}
+ @RequestMapping(value = "/locMast/sts")
+ @Synchronized
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit) {
+ EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
+ return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
--
Gitblit v1.9.1