From 37a846870b5f66637010bcc7f636069793472679 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 一月 2021 13:17:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 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 7a6bac4..627b600 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -3,26 +3,68 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+@Slf4j
@Service("basCrnpService")
public class BasCrnpServiceImpl extends ServiceImpl<BasCrnpMapper, BasCrnp> implements BasCrnpService {
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
+
@Override
- public BasCrnp checkSiteStatus(Integer crnId) {
+ public BasCrnp checkSiteStatus(Integer crnId, boolean pakin) {
BasCrnp crnp = this.selectById(crnId);
if (Cools.isEmpty(crnp)) {
throw new CoolException(crnId + "鍙峰爢鍨涙満涓嶅瓨鍦�");
}
- if ("N".equals(crnp.getInEnable())) {
- throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙叆");
+ if (crnp.getCrnErr() != null && crnp.getCrnErr() > 0) {
+ BasCrnError basCrnError = basCrnErrorMapper.selectById(crnp.getCrnErr());
+ throw new CoolException(crnId + "鍙峰爢鍨涙満鍑虹幇"+ ( basCrnError == null? crnp.getCrnErr() : basCrnError.getErrName()) +"寮傚父锛屾棤娉曚綔涓�!");
}
- if ("N".equals(crnp.getOutEnable())) {
- throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙嚭");
+ if (pakin) {
+ if ("N".equals(crnp.getInEnable())) {
+ throw new CoolException(crnId + "鍫嗗灈鏈轰笉鍙叆");
+ }
+ } else {
+ if ("N".equals(crnp.getOutEnable())) {
+ 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 (crnp.getCrnErr() != null && crnp.getCrnErr() > 0) {
+ BasCrnError basCrnError = basCrnErrorMapper.selectById(crnp.getCrnErr());
+ log.error("{}鍙峰爢鍨涙満鍑虹幇{}寮傚父锛屾棤娉曚綔涓�!", crnNo, basCrnError == null? crnp.getCrnErr() : basCrnError.getErrName());
+ 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;
+ }
+ }
+ return true;
+ }
}
--
Gitblit v1.9.1