From 1983df9f47c76e3c047f386e82e89c5537f345ac Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 05 十一月 2025 12:57:32 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index c9507fa..26529f7 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -13,6 +13,8 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.param.BasCrnpParam;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
+import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
import com.zy.core.cache.CrnErrCache;
@@ -119,16 +121,37 @@
if (Cools.isEmpty(basCrnpParam.getLocMastDemoCount()) || basCrnpParam.getLocMastDemoCount()<1){
- return R.error("璇疯緭鍏ユ祴璇曞簱浣嶆暟閲�").add("璇疯緭鍏ユ祴璇曞簱浣嶆暟閲�");
+ return R.error("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶆暟閲�").add("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶆暟閲�");
}
- if (Cools.isEmpty(basCrnpParam.getLocMastDemo())){
- return R.error("璇疯緭鍏ユ祴璇曞簱浣嶅垪琛�").add("璇疯緭鍏ユ祴璇曞簱浣嶅垪琛�");
+ if (Cools.isEmpty(basCrnpParam.getLocMastDemoF())){
+ return R.error("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶅垪琛�").add("璇疯緭鍏ユ祴璇曞湪搴撳簱浣嶅垪琛�");
} else {
- String[] split = basCrnpParam.getLocMastDemo().split(";");
+ String[] split = basCrnpParam.getLocMastDemoF().split(";");
if (split.length!=basCrnpParam.getLocMastDemoCount()){
- return R.error("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�").add("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�");
+ return R.error("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�").add("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�");
}
- basCrnpParam.setLocMastDemo(String.join(";", split));
+ basCrnpParam.setLocMastDemoListF(new ArrayList<>(Arrays.asList(split)));
+ for (String locNo : basCrnpParam.getLocMastDemoListF()){
+ boolean locNoDetection = CodeDetectionUtil.locNoDetection(locNo);
+ if (!locNoDetection){
+ return R.error("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅寮傚父").add("杈撳叆娴嬭瘯鍦ㄥ簱搴撲綅寮傚父");
+ }
+ }
+ }
+ if (Cools.isEmpty(basCrnpParam.getLocMastDemoE())){
+ return R.error("璇疯緭鍏ユ祴璇曠┖搴撲綅鍒楄〃").add("璇疯緭鍏ユ祴璇曠┖搴撲綅鍒楄〃");
+ } else {
+ String[] split = basCrnpParam.getLocMastDemoE().split(";");
+ if (split.length!=basCrnpParam.getLocMastDemoCount()){
+ return R.error("杈撳叆娴嬭瘯绌哄簱浣嶅垪琛ㄦ暟閲忎笉鍖归厤").add("杈撳叆娴嬭瘯绌哄簱浣嶅垪琛ㄦ暟閲忎笉鍖归厤");
+ }
+ basCrnpParam.setLocMastDemoListE(new ArrayList<>(Arrays.asList(split)));
+ for (String locNo : basCrnpParam.getLocMastDemoListE()){
+ boolean locNoDetection = CodeDetectionUtil.locNoDetection(locNo);
+ if (!locNoDetection){
+ return R.error("杈撳叆娴嬭瘯绌哄簱浣嶅紓甯�").add("杈撳叆娴嬭瘯绌哄簱浣嶅紓甯�");
+ }
+ }
}
if (Cools.isEmpty(basCrnpParam.getStaOutDemo())){
@@ -174,7 +197,12 @@
}
}
crnProtocol.setLocMastDemoCount(basCrnpParam.getLocMastDemoCount());
- crnProtocol.setLocMastDemoList(basCrnpParam.getLocMastDemoList());
+ crnProtocol.setLocMastDemoListF(basCrnpParam.getLocMastDemoListF());
+ crnProtocol.setLocMastDemoListE(basCrnpParam.getLocMastDemoListE());
+ ArrayList<String> locMastDemoList = new ArrayList<>();
+ locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
+ locMastDemoList.addAll(basCrnpParam.getLocMastDemoListF());
+ crnProtocol.setLocMastDemoList(locMastDemoList);
crnProtocol.setStaOutDemo(basCrnpParam.getStaOutDemo());
crnProtocol.setStaIntDemo(basCrnpParam.getStaIntDemo());
}
--
Gitblit v1.9.1