From b7b3328fdfa45cf13d1943fa79d47f1b6bb43f01 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 18:22:17 +0800
Subject: [PATCH] 添加定时任务用户

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 83cadf6..59971b5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -1,6 +1,8 @@
 package com.vincent.rsf.server.manager.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
@@ -13,19 +15,23 @@
 import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
 import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
 import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.enums.LocStsType;
 import com.vincent.rsf.server.manager.service.LocService;
 import com.vincent.rsf.server.system.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Api(tags = "搴撲綅淇℃伅")
@@ -40,13 +46,31 @@
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
-        return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
+        List<String> list = new ArrayList<>();
+        list.add("row");
+        list.add("col");
+        list.add("lev");
+        return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true,list)));
     }
 
     @PreAuthorize("hasAuthority('manager:loc:list')")
     @PostMapping("/loc/list")
     public R list(@RequestBody Map<String, Object> map) {
         return R.ok().add(locService.list());
+    }
+
+    @PreAuthorize("hasAuthority('manager:loc:list')")
+    @PostMapping("/loc/areaNoUse/list")
+    public R areaNoUselist(@RequestBody Map<String, Object> map) {
+        String locCode = map.get("locCode").toString();
+        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
+        List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
+                .eq(Loc::getAreaId, loc.getAreaId())
+                .eq(Loc::getChannel,loc.getChannel())
+                .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+        );
+        List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
+        return R.ok(list1);
     }
 
     @PreAuthorize("hasAuthority('manager:loc:list')")
@@ -65,10 +89,26 @@
     @OperationLog("Create 搴撲綅淇℃伅琛�")
     @PostMapping("/loc/save")
     public R save(@RequestBody Loc loc) {
+        if (Objects.isNull(loc.getWarehouseId())) {
+            throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(loc.getAreaId())) {
+            throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(loc.getTypeIds())) {
+            throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+        }
+        String join = StringUtils.join(loc.getTypeIds(), ",");
+        loc.setType(join);
+
         loc.setCreateBy(getLoginUserId());
         loc.setUpdateBy(getLoginUserId());
         if (!locService.save(loc)) {
             return R.error("Save Fail");
+        }
+
+        if (!locService.saveType(loc)) {
+            throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
         }
         return R.ok("Save Success").add(loc);
     }
@@ -76,11 +116,19 @@
     @PreAuthorize("hasAuthority('manager:loc:update')")
     @OperationLog("Update 搴撲綅淇℃伅琛�")
     @PostMapping("/loc/update")
+    @Transactional(rollbackFor = Exception.class)
     public R update(@RequestBody Loc loc) {
         loc.setUpdateBy(getLoginUserId());
-        loc.setUpdateTime(new Date());
+        String join = StringUtils.join(loc.getTypeIds(), ",");
+        loc.setType(join);
+        if (Objects.isNull(loc.getTypeIds())) {
+            throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+        }
         if (!locService.updateById(loc)) {
             return R.error("Update Fail");
+        }
+        if (!locService.updateLoc(loc)) {
+            throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
         }
         return R.ok("Update Success").add(loc);
     }
@@ -117,7 +165,7 @@
         if (Objects.isNull(map.get("ids"))) {
             locs = locService.list();
         } else {
-            locs = locService.list(new LambdaQueryWrapper<Loc>().in(Loc::getId , map.get("ids")).eq(Loc::getStatus, 1));
+            locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getStatus, 1));
         }
         ExcelUtil.build(ExcelUtil.create(locs, Loc.class), response);
     }
@@ -132,18 +180,58 @@
         return locService.modifyLocs(locs);
     }
 
+    @PreAuthorize("hasAuthority('manager:loc:update')")
+    @PostMapping("/loc/batch/area")
+    @ApiOperation("搴撲綅鎵归噺鍒嗗尯")
+    public R batchLocArea(@RequestBody LocModifyParams locs) {
+        if (Objects.isNull(locs)) {
+            throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        locs.setCreateBy(getLoginUserId());
+        locs.setUpdateBy(getLoginUserId());
+        return locService.batchBindLocs(locs);
+    }
+
 
     @PreAuthorize("hasAuthority('manager:loc:update')")
     @ApiOperation("搴撲綅鍒濆鍖�")
     @PostMapping("/loc/init")
     public R initLocInfo(@Valid @RequestBody LocMastInitParam param) {
         if (Objects.isNull(param)) {
-            throw new CoolException("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
+            return R.error("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getTypeIds()) && param.getTypeIds().isEmpty()) {
+            return R.error("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(param.getWarehouseId())) {
+            return R.error("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
         }
         if (Objects.isNull(param.getAreaId())) {
-            throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
+            return R.error("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
         }
-        return locService.initLocs(param);
+        if (Objects.isNull(param.getStartRow())) {
+            return R.error("璧峰鎺掍笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getEndRow())) {
+            return R.error("缁堟鎺掍笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getStartBay())) {
+            return R.error("璧峰鍒椾笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getEndBay())) {
+            return R.error("缁堟鍒椾笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getStartLev())) {
+            return R.error("璧峰灞備笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getEndLev())) {
+            return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
+        }
+        if (Objects.isNull(param.getChannel())) {
+            return R.error("宸烽亾涓嶈兘涓虹┖锛侊紒");
+        }
+
+        return locService.initLocs(param, getLoginUserId());
     }
 
 }

--
Gitblit v1.9.1