From a66b19e1c09201a922735c2325ca04df7fe544af Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:58 +0800
Subject: [PATCH] 空校验；提高代码的健壮性
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 7f822d2..43ea61c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -12,7 +12,6 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderServiceImpl;
-import com.zy.asrs.utils.OrderUtils;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.slf4j.Logger;
@@ -66,6 +65,9 @@
*/
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam) {
+ if (combParam == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
agvMobileService.comb(combParam, getUserId());
return R.ok();
@@ -75,6 +77,9 @@
@RequestMapping("/pick/again/auth")
@ManagerAuth(memo = "鍐嶆鎷ｆ枡")
public R pickAgain(@RequestBody PickParam pickParams) {
+ if (pickParams == null || Cools.isEmpty(pickParams.getLocNo()) || Cools.isEmpty(pickParams.getLocNo())) {
+ return R.error("缂哄皯鍙傛暟");
+ }
agvMobileService.pickAgain(pickParams, 1l);
return R.ok("鎷ｆ枡鎴愬姛");
}
@@ -84,6 +89,9 @@
*/
@PostMapping("/combBinging/auth")
public R combBinding(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("barcode")) || Cools.isEmpty(map.get("stationCode"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
Short containerType = Short.valueOf(barcode.substring(0, 2));
@@ -96,6 +104,9 @@
*/
@PostMapping("/getBasDevp/auth")
public R getBasDevpByFloor(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("floor"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String floor = map.get("floor").toString();
if ("1".equals(floor) || "3".equals(floor)) {
return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
@@ -117,12 +128,17 @@
@PostMapping("/pakin/auth")
@Synchronized
public R pakin(@RequestBody Map<String, Object> map) {
+ if (map == null || Cools.isEmpty(map.get("devNo"))) {
+ return R.error("缂哄皯鍙傛暟");
+ }
List<String> devNos = (List<String>) map.get("devNo");
List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
return agvBasDevpService.selectById(devNo);
}).collect(Collectors.toList());
-
+ if (agvBasDevpList == null) {
+ return R.error("鏆傚瓨浣嶄笉瀛樺湪");
+ }
workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
@@ -136,16 +152,16 @@
@Transactional
@ManagerAuth(memo = "鍚姩鍏ュ簱")
public R startPakin(@RequestBody AgvMobileStartPakin params) {
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
log.info("鍚姩鍏ュ簱,{}", JSON.toJSONString(params));
// 缁勬墭
params.getCombParams().forEach(combParam -> {
agvMobileService.comb(combParam, getUserId());
});
- //鑾峰彇鍒ゆ柇鏃跺摢涓巶鐨勮鍗�
- String csocode = params.getCombParams().get(0).getCombMats().get(0).getCsocode();
- String factory = OrderUtils.getFactory(csocode);
params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
- workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false,factory);
+ workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false);
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
@@ -157,10 +173,12 @@
@Synchronized
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R pakinEmpty(@RequestBody AgvMobileStartParam params) {
-
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
for (AgvMobileStartParam.Pda pda : params.getPad()) {
pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
- workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false,null);
+ workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
}
return R.ok();
@@ -173,9 +191,11 @@
@Synchronized
@ManagerAuth(memo = "绌烘澘鍑哄簱")
public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {
-
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
for (AgvMobileStartParam.Pda pda : params.getPad()) {
- if (pda == null) {
+ if (pda == null || Cools.isEmpty(pda.getDevNo()) || Cools.isEmpty(pda.getContainerType())) {
return R.error("缂哄皯绔欑偣淇℃伅");
}
workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
@@ -189,8 +209,13 @@
*/
@PostMapping("/pakout/empty/container/selector/auth")
public R containerType(@RequestBody HashMap<String, String> params) {
-
+ if (params == null) {
+ return R.error("缂哄皯鍙傛暟");
+ }
String devNo = params.get("devNo");
+ if (Cools.isEmpty(devNo)) {
+ return R.error("缂哄皯绔欑偣鏁版嵁");
+ }
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
@@ -253,7 +278,9 @@
String threeCode = params.get("threeCode");
String matnr = params.get("matnr");
String floor = params.get("floor");
-
+ if (Cools.isEmpty(matnr)) {
+ return R.error("鍙傛暟缂哄け");
+ }
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
@@ -294,7 +321,9 @@
String threeCode = params.get("threeCode");
String matnr = params.get("matnr");
String floor = params.get("floor");
-
+ if (Cools.isEmpty(orderNo, threeCode, matnr)) {
+ return R.error("鍙傛暟缂哄け");
+ }
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("three_code", threeCode).eq("matnr", matnr));
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
@@ -387,7 +416,9 @@
AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
-
+ if (agvLocMastByLocNo==null){
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
String barcode1 = agvLocMastByLocNo.getBarcode();
@@ -510,6 +541,9 @@
String locNo = map.get("locNo");
Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
+ if (agvLocMast == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
agvLocMast.setLocType(moveType);
agvLocMast.setLocType3(floor);
agvLocMastService.update(agvLocMast, wrapper);
--
Gitblit v1.9.1