From 379c55655ef027effbc3fa62b2719b0e9158f0c6 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 04 Sep 2019 11:17:10 +0800
Subject: [PATCH] 按钮文字修改及弹窗内容修改
---
src/main/java/com/moral/common/bean/Constants.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/common/bean/Constants.java b/src/main/java/com/moral/common/bean/Constants.java
index 01d5455..eb934f2 100644
--- a/src/main/java/com/moral/common/bean/Constants.java
+++ b/src/main/java/com/moral/common/bean/Constants.java
@@ -1,8 +1,19 @@
package com.moral.common.bean;
+import com.moral.common.util.ResourceUtil;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
/**
* ������������.
*/
+@Component
public class Constants {
/** The Constant IS_DELETE_TRUE. */
@@ -17,16 +28,36 @@
public static final String IS_USED_FALSE = "0";
public static final String IS_USED_TRUE = "1";
- private static final Integer[] specialOrgIds = new Integer[]{-1};
+ private static Integer[] specialOrgIds;
+ @PostConstruct
+ private void loadSpecialOrgIds(){
+ String orgIds = ResourceUtil.getValue("specialOrgIds");
+ if(!StringUtils.isBlank(orgIds)){
+ String [] orgIdArray = orgIds.split(",");
+ if(!ArrayUtils.isEmpty(orgIdArray)){
+ List<Integer> orgIdList = Arrays.asList(orgIdArray).stream().map(Integer::new).collect(Collectors.toList());
+ specialOrgIds = orgIdList.toArray(new Integer[orgIdList.size()]);
+ }
+ }
+ }
public static final Boolean isNotSpecialOrgId(Integer orgId) {
+ if(ArrayUtils.isEmpty(specialOrgIds)){
+ return true;
+ }
for(int i = 0; i < specialOrgIds.length; ++i) {
if (specialOrgIds[i].equals(orgId)) {
return false;
}
}
-
return true;
}
+ //device ������
+ public static final String DEVICE_STATE_NORMAL ="0";
+ public static final String DEVICE_STATE_MILD = "1";
+ public static final String DEVICE_STATE_MIDDLE ="2";
+ public static final String DEVICE_STATE_SERIOUS ="3";
+ public static final String DEVICE_STATE_OFFLINE ="4";
+ public static final String DEVICE_STATE_MAINTENANCE ="9";
}
--
Gitblit v1.8.0