From a52f8c508d08014d1a153cfc02e12b5fc185a3a4 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 11 七月 2024 15:28:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/core/utils/Constants.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 138 insertions(+), 34 deletions(-) diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java index 9f53934..5fd3e3a 100644 --- a/server/service/src/main/java/com/doumee/core/utils/Constants.java +++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java @@ -1,19 +1,25 @@ package com.doumee.core.utils; +import com.alibaba.fastjson.JSONObject; +import com.doumee.dao.business.vo.UnitCodeVo; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.io.IOException; import java.math.BigDecimal; import java.net.URLDecoder; import java.text.SimpleDateFormat; +import java.util.*; +import java.util.Date; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Random; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -31,6 +37,7 @@ public static final String HK_PUSH_URL = "HK_PUSH_URL"; public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ; public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ; + public static final String REDIS_TOKEN_KEY = "token_"; //琚嫓璁夸汉淇℃伅鏍¢獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍¢獙锛� public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID"; @@ -72,44 +79,89 @@ public static final String FTP_USERNAME ="FTP_USERNAME" ; public static final String FTP_PWD ="FTP_PWD" ; public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ; - public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ; - public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ; - public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ; - public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ; - public static final String ERP ="ERP" ; public static final Integer THREE =3 ; public static final Integer FOUR =4 ; public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN"; public static final String VIRTUAL_CARD_INDEX = "02098469790"; public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ; - public static boolean DEALING_HK_SYNCPRIVILEGE= false; - public static boolean DEALING_HK_SYNCDEVICE = false; - public static boolean DEALING_HK_SYNCDEVICE_STATUS = false; - public static boolean DEALING_HK_SYNCPARK = false; - public static boolean DEALING_HK_IMG = false; - public static boolean DEALING_HK_ORG = false; - public static boolean DEALING_HK_USER = false; - public static boolean DEALING_HK_DEL_USER = false; - public static boolean DEALING_HK_VISIT = false; - public static boolean DEALING_HK_VISIT_EXPIRE = false; - public static boolean DEALING_FROM_HK_VISIT = false; - public static boolean DEALING_HK_EMPOWER = false; - public static boolean DEALING_HK_EMPOWER_DETAIL = false; - public static boolean DEALING_HK_EMPOWER_RESULT = false; - public static boolean DEALING_HK_PARKBOOK = false; - // ERP鎺ュ彛閰嶇疆 - public static final String ERP_CONFIG = "ERP_CONFIG"; - // ERP ACCESS_KEY - public static final String ERP_ACCESS_KEY = "ERP_ACCESS_KEY"; - // ERP ACCESS_SECRET - public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET"; + public static final String UNIT_CODE = "UNIT_CODE" ; + public static final String ZBOM = "ZBOM" ; + public static final String ZBOM_IAM_APPKEY = "ZBOM_IAM_APPKEY"; + public static final String ZBOM_IAM_APPID = "ZBOM_IAM_APPID"; - // 鍐呴儴浜哄憳鍐荤粨閰嶇疆鏃堕棿 - public static final String TIMEOUT_FREEZE = "TIMEOUT_FREEZE"; + public static Integer parseIntByStr(String idtOrgStatus) { + try { + return Integer.parseInt(idtOrgStatus); + }catch (Exception e){ + return null; + } + } - // 瓒呮椂棰勮閰嶇疆 - public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING"; - // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧� + /** + * 闄勪欢瀵硅薄绫诲瀷 0news澶氬浘 1news瑙嗛 + */ + public enum MultiFile{ + NEWS_FILE(0, "鎺ㄥ箍璧勮闄勪欢", "NEWS") + + ; + // 鎴愬憳鍙橀噺 + private String name; + private int key; + private String info;// 鎻忚堪 + + // 鏋勯�犳柟娉� + MultiFile(int key, String name, String info) { + this.name = name; + this.key = key; + this.info = info; + } + + // 鏅�氭柟娉� + public static String getName(int index) { + for (MultiFile c : MultiFile.values()) { + if (c.getKey() == index) { + return c.name; + } + } + return null; + } + + // 鏅�氭柟娉� + public static String getInfo(int index) { + for (MultiFile c : MultiFile.values()) { + if (c.getKey() == index) { + return c.info; + } + } + return null; + } + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; + } + + // get set 鏂规硶 + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getKey() { + return key; + } + + public void setKey(int key) { + this.key = key; + } + + } public static Date getBirthdyByCardNo(String idCard){ if(idCard ==null || idCard.length()<14){ @@ -252,9 +304,12 @@ public static final String ACCESS_KEY = "ACCESS_KEY"; public static final String ENDPOINT = "ENDPOINT"; public static final String RESOURCE_PATH = "RESOURCE_PATH"; + public static final String USERS_FILE = "USERS_FILE"; + public static final String NEWS_FILE = "NEWS_FILE"; //鍙戦�佷細璁紑濮� 瀹氭椂鎻愬墠澶氬皯鍒嗛挓鍙戦�� public static final String SYSTEM ="SYSTEM"; + public static final String MEMBER ="MEMBER"; public static final String COFFEE_BEAN_TASK ="COFFEE_BEAN_TASK"; @@ -273,12 +328,19 @@ + public static final String WX_MINI_CONFIG = "WX_MINI_CONFIG"; + public static final String WX_APPID_CUSTOMER = "WX_APPID_CUSTOMER"; + public static final String WX_SECRET_CUSTOMER = "WX_SECRET_CUSTOMER"; + public static final String WX_APPID_PERSONNEL = "WX_APPID_PERSONNEL"; + public static final String WX_SECRET_PERSONNEL = "WX_SECRET_PERSONNEL"; public interface RedisKeys { public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER"; public static final String IMPORTING_SHOP ="IMPORTING_SHOP"; + public static final String IAM_APPID ="IAM_APPID"; + public static final String IAM_APPKEY ="IAM_APPKEY"; public static final String SHOP_TREE ="SHOP_TREE"; public static final String ERP_TOKEN ="ERP_TOKEN"; public static final long EXPIRE_TIME = 7200; @@ -320,6 +382,12 @@ } + public static boolean equalsLong(Long a, Long b) { + if (a == null || b==null) { + return false; + } + return a.equals(b); + } public static boolean equalsInteger(Integer a, Integer b) { if (formatIntegerNum(a) == formatIntegerNum(b)) { return true; @@ -426,10 +494,35 @@ public static void main(String[] args) { System.out.println((DESUtil.decrypt(Constants.EDS_PWD, "En35O2o+Mpw5bThqkT8lmE6UPG+W6LFs"))); -// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription()); -// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription()); - + Map<String,String> map = new HashMap<>(); + map.put("101","蹇楅偊鏈儴"); + map.put("102","鍒堕�犱簨涓氶儴"); + map.put("103","鑲ヤ笢閿�鍞叕鍙�"); + map.put("104","ZB/蹇楅偊鍘ㄦ煖"); + map.put("105","鍟嗗搧浜嬩笟閮�"); + map.put("106","宸㈡箹閿�鍞叕鍙�"); + map.put("107","IK/鍏ㄥ眿瀹氬埗"); + map.put("108","宸ョ▼浜嬩笟閮�"); + map.put("109","鍚堣偉閿�鍞叕鍙�"); + map.put("110","澶栬锤浜嬩笟閮�"); + map.put("111","蹇楅偊瀹跺眳鍏徃"); + map.put("112","ZB/蹇楅偊琛f煖"); + map.put("127","蹇楅偊鍘ㄦ煖鑲′唤鏈夐檺鍏徃"); + map.put("141","鍚堣偉蹇楅偊鏈ㄤ笟鏈夐檺鍏徃"); + map.put("161","ZB/蹇楅偊鏈ㄩ棬"); + map.put("263","鍥借锤鍏徃"); + List<UnitCodeVo> list = new ArrayList<>(); + Iterator<Map.Entry<String, String>> iterator = map.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry<String, String> entry = iterator.next(); + UnitCodeVo m = new UnitCodeVo(); + m.setCode(entry.getKey()); + m.setName(entry.getValue()); + list.add(m); + } +System.out.println(JSONObject.toJSONString(list)); + } @@ -502,4 +595,15 @@ return reqJson; } + public static String getRandom6Num( ) { + Random random = new Random(); + StringBuilder sb = new StringBuilder(); + + for (int i = 0; i < 6; i++) { + int digit = random.nextInt(10); + sb.append(digit); + } + + return sb.toString(); + } } -- Gitblit v1.9.3