From a412fb692f1ff4a5b18e64ac1bdb5788fd55d4d0 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 15:05:59 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/LocAroundBindController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
index f998722..90de26c 100644
--- a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
+++ b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
@@ -1,19 +1,20 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.LocAroundBind;
-import com.zy.asrs.entity.LocCache;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.InitDeviceLocParams;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.LocAroundBindService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,8 @@
@Autowired
private LocAroundBindService locAroundBindService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
@RequestMapping(value = "/locAroundBind/{id}/auth")
@ManagerAuth
@@ -66,6 +69,22 @@
@RequestMapping(value = "/locAroundBind/add/auth")
@ManagerAuth
public R add(LocAroundBind locAroundBind) {
+ if (Objects.isNull(locAroundBind)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBlocNo()));
+ if (!Objects.isNull(aroundBind)) {
+ return R.error("宸ヤ綅宸茬粦瀹氾紝涓嶈兘閲嶅缁戝畾锛�");
+ }
+
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBlocNo()));
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
+ locMast.setDeleted(1);
+ locMast.setFrozen(1);
+
+ if (!locMastService.updateById(locMast)) {
+ return R.error("鍘熷簱绂佺敤澶辫触锛侊紒");
+ }
locAroundBindService.insert(locAroundBind);
return R.ok();
}
@@ -128,9 +147,9 @@
}
/**
- * 鍙版満缁戝畾浣滀笟搴撲綅
+ * 鏈哄彴缁戝畾浣滀笟搴撲綅
*
- * @param locAroundBind
+ * @param
* @return
*/
@ManagerAuth
@@ -140,7 +159,7 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
if (Cools.isEmpty(params.getDevNo())) {
- return R.error("鍙版満鍙蜂笉鑳戒负绌�");
+ return R.error("鏈哄彴鍙蜂笉鑳戒负绌�");
}
if (Cools.isEmpty(params.getStartRow())) {
return R.error("璧峰鎺掍笉鑳戒负绌�");
--
Gitblit v1.9.1