From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheSiteController.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheSiteController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheSiteController.java
index 14aa1a8..e699718 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheSiteController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheSiteController.java
@@ -4,6 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.Platform;
+import com.zy.asrs.wms.asrs.entity.param.BindPlatformParam;
+import com.zy.asrs.wms.asrs.entity.param.CacheSiteEmptyInParam;
+import com.zy.asrs.wms.asrs.entity.param.PlatformInParam;
+import com.zy.asrs.wms.asrs.entity.param.SeedCompleteParam;
+import com.zy.asrs.wms.asrs.service.PlatformService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -17,10 +24,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -28,6 +32,8 @@
@Autowired
private CacheSiteService cacheSiteService;
+ @Autowired
+ private PlatformService platformService;
@PreAuthorize("hasAuthority('asrs:cacheSite:list')")
@PostMapping("/cacheSite/page")
@@ -105,4 +111,57 @@
return R.ok().add(cacheSiteService.getChannelList());
}
+ @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
+ @OperationLog("鎾瀹屾垚棰勬娴�")
+ @PostMapping("/cacheSite/seedCompletePreview")
+ public R seedCompletePreview(@RequestBody SeedCompleteParam param) {
+ boolean check = cacheSiteService.seedCompletePreview(param);
+ return R.ok().add(check);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
+ @OperationLog("鎾瀹屾垚")
+ @PostMapping("/cacheSite/seedComplete")
+ public R seedComplete(@RequestBody SeedCompleteParam param) {
+ cacheSiteService.seedComplete(param);
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
+ @OperationLog("闆嗚揣鍏ュ簱")
+ @PostMapping("/cacheSite/platformIn")
+ public R platformIn(@RequestBody PlatformInParam param) {
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
+ @OperationLog("绌烘墭鐩樺叆绔�")
+ @PostMapping("/cacheSite/emptyIn")
+ public R cacheSiteEmptyIn(@RequestBody CacheSiteEmptyInParam param) {
+ return R.ok();
+ }
+
+ @PreAuthorize("hasAuthority('asrs:cacheSite:update')")
+ @OperationLog("缁戝畾闆嗚揣鍖哄煙缂栧彿")
+ @PostMapping("/cacheSite/bindPlatform")
+ public R bindPlatform(@RequestBody BindPlatformParam param) {
+ CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, param.getSiteNo()));
+ if(cacheSite == null) {
+ throw new CoolException("缂撳瓨绔欑偣涓嶅瓨鍦�");
+ }
+
+ Platform platform = platformService.getById(param.getPlatformId());
+ if (platform == null) {
+ throw new CoolException("闆嗚揣鍖哄煙涓嶅瓨鍦�");
+ }
+
+ cacheSite.setPlatformId(platform.getId());
+ cacheSite.setPlatformNo(platform.getPlatformNo());
+ cacheSite.setUpdateTime(new Date());
+ if (!cacheSiteService.updateById(cacheSite)) {
+ throw new CoolException("缁戝畾闆嗚揣鍖哄煙缂栧彿澶辫触");
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1