From d02571d59633367ac76b7f58ab38584698b1aa1b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 17 十月 2024 09:55:37 +0800
Subject: [PATCH] 高级查询中增加范围查询功能

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java |  121 +++++++++------------------------------
 1 files changed, 29 insertions(+), 92 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 5e9e678..9522cb8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -9,9 +9,7 @@
 import org.springblade.core.tool.utils.Func;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 鏂板鏃堕粯璁ゅ�煎睘鎬ц祴鍊�
@@ -50,7 +48,6 @@
 				// 璁剧疆鎵�鏈夎��
 				baseModel.setOwner(AuthUtil.getUserId().toString());
 			}
-
 			baseModel.setVersionSeq(1);
 			baseModel.setVersionRule("0");
 			baseModel.setVersionValue("1");
@@ -90,20 +87,19 @@
 			baseModel.setFirstV("1");
 			baseModel.setLastR("1");
 			baseModel.setLastV("1");
-			baseModel.setRevisionSeq(1);
 			// TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
 			if(Func.isBlank(baseModel.getOwner())){
 				// 璁剧疆鎵�鏈夎��
 				baseModel.setOwner(Func.isNotEmpty(user) ? user.getUserId().toString():AuthUtil.getUserId().toString());
 			}
-
 			baseModel.setVersionSeq(1);
-			baseModel.setVersionRule("0");
 			baseModel.setVersionValue("1");
-			baseModel.setRevisionOid(VciBaseUtil.getPk());
-			baseModel.setLastModifier(account);
+			baseModel.setVersionRule("0");
+			baseModel.setRevisionSeq(1);
 			baseModel.setRevisionValue("1");
 			baseModel.setRevisionRule("1");
+			baseModel.setRevisionOid(VciBaseUtil.getPk());
+			baseModel.setLastModifier(account);
 			baseModel.setTenantId(Func.isNotEmpty(user) ? user.getTenantId():AuthUtil.getTenantId());
 		}catch (VciBaseException e){
 			e.printStackTrace();
@@ -121,8 +117,9 @@
 	public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
 		BaseModel baseModel = object;
 		try {
-			baseModel.setLastModifyTime(new Date());
-			baseModel.setTs(new Date());
+			Date date = new Date();
+			baseModel.setLastModifyTime(date);
+			baseModel.setTs(date);
 			// 鐢ㄦ埛id
 			// String userId = AuthUtil.getUserId().toString();
 			// 瑕佹眰鏀规垚璐﹀彿
@@ -156,13 +153,13 @@
 	}
 
 	/**
-	 * 鏂板鏃跺~鍏呴粯璁ゅ��
+	 * 鏂板鏃跺~鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
 	 * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
 	 * @param <T>   杩斿洖鍊肩殑绫诲瀷
 	 * @return
 	 * @throws VciBaseException
 	 */
-	public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase) throws VciBaseException {
+	public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,boolean isCase, BladeUser user) throws VciBaseException {
 		BaseModel baseModel = object;
 		baseModel.getData().putAll(dataMap);
 		try {
@@ -221,91 +218,13 @@
 
 			baseModel.setRevisionOid(dataMap.getOrDefault(isCase?"REVISIONOID":"revisionoid",""));
 			baseModel.setRevisionValue(dataMap.getOrDefault(isCase?"REVISIONVALUE":"revisionvalue",""));
-			baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+			baseModel.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
 			baseModel.setLcStatus(dataMap.getOrDefault(isCase?"LCSTATUS":"lcstatus",""));
 			baseModel.setName(dataMap.getOrDefault(isCase?"NAME":"name",""));
 			baseModel.setTenantId(dataMap.getOrDefault(isCase?"TENANT_ID":"tenant_id",""));
 			baseModel.setDescription(dataMap.getOrDefault(isCase?"DESCRIPTION":"description",""));
 			baseModel.setCopyFromVersion(dataMap.getOrDefault(isCase?"COPYFROMVERSION":"copyfromversion",""));
 			Object secretgrade=dataMap.get(isCase?"SECRETGRADE":"secretgrade");
-			if(secretgrade!=null){
-				baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
-			}
-		}catch (VciBaseException e){
-			e.printStackTrace();
-			throw e;
-		}
-		return (T)baseModel;
-	}
-
-	/**
-	 * 鏂板鏃跺~鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
-	 * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
-	 * @param <T>   杩斿洖鍊肩殑绫诲瀷
-	 * @return
-	 * @throws VciBaseException
-	 */
-	public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object, BladeUser user) throws VciBaseException {
-		BaseModel baseModel = object;
-		try {
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			baseModel.setOid(dataMap.getOrDefault("OID",""));
-			baseModel.setId(dataMap.getOrDefault("ID",""));
-			Map<String,Object> newDataMap=new HashMap<>();
-			/*for (String key:dataMap.keySet()){
-				Object value=dataMap.get(key);
-				newDataMap.put(key.toLowerCase(Locale.ROOT),value);
-			}*/
-			/*	dataMap.forEach((key,value)->{
-				newDataMap.put(key.toLowerCase(Locale.ROOT),value);
-			});*/
-			//baseModel.setData((Map)newDataMap);
-			Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
-			if(createTimeObj!=null) {
-				String createTime = createTimeObj.toString();
-				baseModel.setCreateTime(chageStringToDate(createTime));
-			}
-			baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
-
-			Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
-			if(lastModifyTimeObj!=null) {
-				String lastModifyTime = lastModifyTimeObj.toString();
-				baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
-			}
-			Object tsObj=dataMap.getOrDefault("TS","");
-			if(tsObj!=null) {
-				String ts = tsObj.toString();
-				baseModel.setTs(chageStringToDate(ts));
-			}
-			baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
-			//鐢ㄦ埛id ; 瑕佹眰鏀规垚浜嗚处鍙�
-			// String userId = AuthUtil.getUserId().toString();
-			baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
-			baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
-			baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
-			baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
-			baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
-			baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
-			Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
-			if(revisionseq!=null){
-				baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
-			}
-
-			baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
-			Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
-			if(versionseq!=null){
-				baseModel.setVersionSeq(chageStringToInt(versionseq.toString()));
-			}
-			baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
-			baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
-			baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
-			baseModel.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
-			baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
-			baseModel.setName(dataMap.getOrDefault("NAME",""));
-			baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
-			baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
-			baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
-			Object secretgrade=dataMap.get("SECRETGRADE");
 			if(secretgrade!=null){
 				baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
 			}
@@ -337,4 +256,22 @@
 		return date;
 	}
 
+	/**
+	 * map瀵硅薄杞崲涓哄皬鍐�
+	 * @param dataMapList
+	 * @param isLowerCase
+	 */
+	public static void mapToLowerCase(List<Map<String,String>> dataMapList, boolean isLowerCase){
+		// 閬嶅巻List涓殑姣忎釜Map
+		for (Map<String, String> map : dataMapList) {
+			Map<String, String> newMap = new HashMap<>();
+			// 閬嶅巻姣忎釜Map涓殑key锛屽苟灏嗗叾杞崲涓哄皬鍐�
+			for (String key : map.keySet()) {
+				newMap.put(isLowerCase ? key.toLowerCase():key.toLowerCase(Locale.ROOT), map.get(key));
+			}
+			// 鐢ㄦ柊鐨凪ap鏇挎崲鏃х殑Map
+			dataMapList.set(dataMapList.indexOf(map), newMap);
+		}
+	}
+
 }

--
Gitblit v1.9.3