From 08e85d26f1a995ac13de724ddc683fa241b5ccc2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 16:53:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 99 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index ca40971..7b1e981 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -17,8 +17,11 @@
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.toolmodel.DateConverter;
import com.vci.ubcs.starter.web.wrapper.VciQueryWrapperForDO;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ResourceUtils;
@@ -49,6 +52,15 @@
private static String localIp = null;
public VciBaseUtil() {
+ }
+
+ /**
+ * 妫�鏌ユ槸鍚︿负閰嶇疆鐨勮秴绠＄鎴峰拰鐢ㄦ埛
+ * @return false涓嶆槸瓒呯锛宼rue鏄秴绠�
+ */
+ public static Boolean checkAdminTenant(){
+ return NacosConfigCache.getAdminUserInfo().getTenantId().equals(AuthUtil.getTenantId())
+ && NacosConfigCache.getAdminUserInfo().getUserName().equals(AuthUtil.getUserName());
}
public static String getPk() {
@@ -867,7 +879,11 @@
}
public static String getTableName(String btmname) {
- return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY ? "vcibt_" : "pl_code_") + btmname.trim().toLowerCase();
+ return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY ? "PLBT_CODE" : "PL_CODE_") + btmname.trim().toLowerCase();
+ }
+
+ public static String getTableName(String btmname,Boolean isMdmTable) {
+ return (isMdmTable ? "PLBT_CODE_" : "PL_CODE_") + btmname.trim().toUpperCase(Locale.ROOT);
}
public static Field getTsField(Class c) {
@@ -1301,9 +1317,11 @@
Field[] declaredFields = type.getDeclaredFields();
Map<String, String> fieldMap = new HashMap();
String existField = "";
+ if(existFild == null){
+ existFild = new HashSet<>();
+ }
for (Field declaredField : declaredFields) {
declaredField.setAccessible(true);
-
// 鑾峰彇瀛楁鐨勫��
boolean isTableField = declaredField.isAnnotationPresent(TableField.class);
if (isTableField) {
@@ -1314,7 +1332,7 @@
}
String value = tableField.value();
if(net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils.isNotBlank(value)){
- fieldMap.put(declaredField.getName(), value);
+ fieldMap.put(declaredField.getName(), value.trim());
}
}
}
@@ -1327,27 +1345,35 @@
((!"".equals(existField) && !existField.contains(propertyName.toLowerCase()+","))||"data".equals(propertyName))) {
Method readMethod = descriptor.getReadMethod();
Object result = readMethod.invoke(bean, new Object[0]);
+ if(result instanceof String){
+ result=((String) result).trim();
+ }
if (result != null) {
if ("data".equals(propertyName)){
mapData = (Map) result;
}else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
- returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), result);
}
} else if(existFild.contains((fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName).toLowerCase())){
- returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName).toLowerCase():propertyName.toLowerCase(), "");
}
}
}
- //浣滅敤涓昏鐢ㄤ簬宸睲AP涓殑鏁版嵁涓哄噯锛宐ean閲岄潰閬囧埌瀛楁鐩稿悓涔熶細杩涜瑕嗙洊銆�
- if(existFild == null){
- returnMap.putAll((Map) mapData);
- }else{
- Map resulMapChild = (Map) mapData;
- for (Object o : resulMapChild.keySet()) {
- if(existFild.contains(String.valueOf(o).toLowerCase())){
- returnMap.put(String.valueOf(o).toLowerCase(),resulMapChild.get(o));
+ //浣滅敤涓昏鐢ㄤ簬宸睲AP涓殑鏁版嵁涓哄噯锛宐ean閲岄潰閬囧埌瀛楁鐩稿悓涓攎ap閲岄潰鏁版嵁涓虹┖锛屽垯浣跨敤bean閲岄潰鐨勫��,
+// Map resulMapChild = (Map) mapData;
+ for (Object o : mapData.keySet()) {
+ if(existFild == null || existFild.contains(String.valueOf(o).toLowerCase())){
+ if((Func.isNotBlank(String.valueOf(returnMap.get(String.valueOf(o).toLowerCase())))
+ && returnMap.get(String.valueOf(o).toLowerCase()) !=null)
+ && Func.isBlank(String.valueOf(mapData.get(o)))){
+ continue;
}
+ Object result=mapData.get(o);
+ if(result instanceof String){
+ result=((String) result).trim();
+ }
+ returnMap.put(String.valueOf(o).toLowerCase(),result);
}
}
return returnMap;
@@ -1419,6 +1445,66 @@
return sb.toString();
}
+ public static String convertArabicToRoman(int num) {
+ int[] values={1000,900,500,400,100,90,50,40,10,9,5,4,1};
+ String[] romans={"M","CM","D","CD","C","XC","L","XL","X","IX","V","IV","I"};
+ StringBuilder sb=new StringBuilder();
+ for(int i=0;i<values.length;i++){
+ while(num>=values[i]){
+ num=num-values[i];
+ sb.append(romans[i]);
+ }
+ }
+ return sb.toString();
+ }
+ /**
+ * 鎶婄綏椹暟瀛楄浆鎹负闃挎媺浼暟瀛�
+ * @param m
+ * @return
+ */
+ public static int convertRomanToArabic(String m) {
+ int graph[] = new int[400];
+ graph['I'] = 1;
+ graph['V'] = 5;
+ graph['X'] = 10;
+ graph['L'] = 50;
+ graph['C'] = 100;
+ graph['D'] = 500;
+ graph['M'] = 1000;
+ char[] num = m.toCharArray();
+ int sum = graph[num[0]];
+ for (int i = 0; i < num.length - 1; i++) {
+ if (graph[num[i]] >= graph[num[i + 1]]) {
+ sum += graph[num[i + 1]];
+ } else {
+ sum = sum + graph[num[i + 1]] - 2 * graph[num[i]];
+ }
+ }
+ return sum;
+ }
+ /***
+ * 鏍￠獙鏄惁鏄綏椹暟瀛�
+ * @param s
+ * @return
+ */
+ public static boolean isRoman(String s) {
+ // 妫�鏌ヨ緭鍏ョ殑瀛楃涓叉槸鍚︿负绌�
+ if (s == null || s.length() == 0) {
+ return false;
+ }
+ // 灏嗚緭鍏ョ殑瀛楃涓茶浆鎹负澶у啓瀛楁瘝
+ s = s.toUpperCase();
+ // 杩斿洖缁撴灉
+ Pattern pattern = Pattern.compile("^M{0,3}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$");
+ return pattern.matcher(s ).matches();
+ }
+ public static String intToRomanTwo(int num) {
+ String M[] = {"", "M", "MM", "MMM"};
+ String C[] = {"", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM"};
+ String X[] = {"", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC"};
+ String I[] = {"", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"};
+ return M[num/1000]+C[(num%1000)/100]+X[(num%100)/10]+I[num%10];
+ }
}
--
Gitblit v1.9.3