From 2bd674963fda5c14685ab3fa973366d2c2ae527f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 一月 2021 14:19:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index a52b245..ac5e058 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -6,8 +6,10 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+@Slf4j
@Service("basCrnpService")
public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
@@ -18,11 +20,44 @@
throw new CoolException(crnId + "鍙峰爢鍨涙満涓嶅瓨鍦�");
}
if ("N".equals(crnp.getInEnable())) {
- throw new CoolException("鍫嗗灈鏈轰笉鍙叆");
+ throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙叆");
}
if ("N".equals(crnp.getOutEnable())) {
- throw new CoolException("鍫嗗灈鏈轰笉鍙嚭");
+ throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙嚭");
}
return crnp;
}
+
+ @Override
+ public boolean checkSiteError(Integer crnNo, boolean pakin) {
+ BasCrnp crnp = this.selectById(crnNo);
+ if (Cools.isEmpty(crnp)) {
+ log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
+ return false;
+ }
+ if (pakin) {
+ if ("N".equals(crnp.getInEnable())) {
+ log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
+ return false;
+ }
+ } else {
+ if ("N".equals(crnp.getOutEnable())) {
+ log.error("{}鍙峰爢鍨涙満涓嶅彲鍑�", crnNo);
+ return false;
+ }
+ }
+ if (crnp.getCrnSts() != null) {
+ if (crnp.getCrnSts() == 10) {
+ log.error("{}鍙峰爢鍨涙満鐘舵�佷负10.閿欒", crnNo);
+ return false;
+ }
+ }
+ if (crnp.getCrnErr() != null) {
+ if (crnp.getCrnErr() != 0) {
+ log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
+ return false;
+ }
+ }
+ return true;
+ }
}
--
Gitblit v1.9.1