From 5e9e87b983ca0d293ea5ee4ec72e84e0000f56fd Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 28 六月 2023 16:53:25 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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 4a3e097..4a08af9 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
@@ -869,7 +869,7 @@
}
public static String getTableName(String btmname) {
- return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY ? "pl_code_" : "vcibt_") + btmname.trim().toLowerCase();
+ return (VciQueryWrapperForDO.USER_TABLE_COMPATIBILITY ? "vcibt_" : "pl_code_") + btmname.trim().toLowerCase();
}
public static Field getTsField(Class c) {
@@ -1143,7 +1143,38 @@
public static <T> Collection<Collection<T>> switchCollectionForOracleIn(Collection<T> list) {
return switchCollectionForOracleIn(list, 500);
}
-
+ /**
+ * oracle in 鏌ヨ涓嶈兘瓒呰繃1000锛岃浆鎹竴涓嬮泦鍚�
+ * 鐢变簬SQL璇彞1000涓彲鑳藉緢闀匡紝瓒呰繃oracle10g锛屾墍浠ョ壓鐗叉�ц兘鍒嗛厤涓�500涓暟缁�
+ * @param list 闇�瑕佽浆鎹㈢殑鍒楄〃鍐呭
+ * @return 鍒嗙粍鍚庣殑list
+ */
+ public static <T> List<List<T>> switchListForOracleIn(List<T> list) {
+ List<List<T>> listHasList = new ArrayList<List<T>>();
+ if(list == null){
+ return listHasList;
+ }
+ List<T> newList = new ArrayList<T>();
+ for(Object obj : list){
+ //涓轰簡璁﹍ist杩樺彲浠ユ坊鍔犲唴瀹癸紝鍥犱负浣跨敤sublist鍚庯紝list涓嶈兘鍐岮dd浜�
+ newList.add((T)obj);
+ }
+ int muti = 1;
+ if(newList.size() >500){
+ int balance = newList.size()%500;
+ muti = (newList.size() - balance)/500 + (balance == 0?0:1);
+ }
+ for(int i = 0 ; i < muti; i ++){
+ int start = i*500;
+ int end = start + 500;
+ if(i == muti-1 || end >newList.size() ){
+ end = newList.size();
+ }
+ List subList = newList.subList(start,end);
+ listHasList.add(subList);
+ }
+ return listHasList;
+ }
public static <T> Collection<Collection<T>> switchCollectionForOracleIn(Collection<T> collection, int preSize) {
Collection<Collection<T>> listHasList = new ArrayList();
if (collection == null) {
@@ -1270,6 +1301,7 @@
PropertyDescriptor[] propertyDescriptors = beanInfo
.getPropertyDescriptors();
Field[] declaredFields = type.getDeclaredFields();
+ Map<String, String> fieldMap = new HashMap();
String existField = "";
for (Field declaredField : declaredFields) {
declaredField.setAccessible(true);
@@ -1281,6 +1313,10 @@
Boolean fieldValue = tableField.exist();
if(fieldValue == false){
existField += declaredField.getName().toLowerCase()+",";
+ }
+ String value = tableField.value();
+ if(net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils.isNotBlank(value)){
+ fieldMap.put(declaredField.getName(), value);
}
}
}
@@ -1298,10 +1334,10 @@
if ("data".equals(propertyName)){
returnMap.putAll((Map) result);
}else {
- returnMap.put(propertyName, result);
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, result);
}
} else {
- returnMap.put(propertyName, "");
+ returnMap.put(fieldMap.containsKey(propertyName)?fieldMap.get(propertyName):propertyName, "");
}
}
}
--
Gitblit v1.9.3