From 302e3925330aa8a78504069bceaabf7885a11c63 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 23 九月 2020 17:09:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/properties/SystemProperties.java | 2 +-
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 1f87a7d..d5df0d1 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -58,6 +58,9 @@
if(station.getWrkNo()!=null && station.getWrkNo()>0) {
throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
}
+ if(!station.getInEnable().equals("Y")) {
+ throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
+ }
if(wrkMastService.getWorkingMast(devpNo)>0){
throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 8aaa8ef..ba6350b 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -63,7 +63,7 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String timeStr = "2020-08-01 17:48:35";
+ String timeStr = "2021-08-01 17:48:35";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
System.out.println("婵�娲荤爜锛�"+code);
--
Gitblit v1.9.1