From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
java110-core/src/main/java/com/java110/core/language/En.java | 166 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 131 insertions(+), 35 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/language/En.java b/java110-core/src/main/java/com/java110/core/language/En.java
index d08bc27..29cb226 100644
--- a/java110-core/src/main/java/com/java110/core/language/En.java
+++ b/java110-core/src/main/java/com/java110/core/language/En.java
@@ -1,5 +1,7 @@
package com.java110.core.language;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.java110.dto.menuCatalog.MenuCatalogDto;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
@@ -51,6 +53,31 @@
}
@Override
+ public JSONArray getPrivilegeMenuDto(JSONArray tmpPrivilegeArrays) {
+ String menuName = "";
+ JSONObject priObj = null;
+ for (int priIndex = 0;priIndex < tmpPrivilegeArrays.size(); priIndex++) {
+ priObj = tmpPrivilegeArrays.getJSONObject(priIndex);
+ menuName = menus.get(priObj.get("gName"));
+ if (!StringUtil.isEmpty(menuName)) {
+ priObj.put("gName", menuName);
+ }
+
+ menuName = menus.get(priObj.get("mName"));
+ if (!StringUtil.isEmpty(menuName)) {
+ priObj.put("mName", menuName);
+ }
+
+ menuName = menus.get(priObj.get("pName"));
+ if (!StringUtil.isEmpty(menuName)) {
+ priObj.put("pName", menuName);
+ }
+
+ }
+ return tmpPrivilegeArrays;
+ }
+
+ @Override
public ResultVo getResultVo(ResultVo resultVo) {
String msg = msgs.get(resultVo.getMsg());
if (!StringUtil.isEmpty(msg)) {
@@ -62,7 +89,7 @@
public String getLangMsg(String msg){
String msgStr = msgs.get(msg);
- if (!StringUtil.isEmpty(msg)) {
+ if (!StringUtil.isEmpty(msgStr)) {
return msgStr;
}
@@ -72,67 +99,67 @@
menuCatalogs.put("璁惧","Machine");
menuCatalogs.put("棣栭〉","Index");
menuCatalogs.put("涓氬姟鍙楃悊","Business");
- menuCatalogs.put("璐圭敤鎶ヨ〃","report");
+ menuCatalogs.put("璐圭敤鎶ヨ〃","Report");
menuCatalogs.put("鐗╀笟鏈嶅姟","Service");
menuCatalogs.put("璁惧鍋滆溅","Parking");
menuCatalogs.put("甯哥敤鑿滃崟","Tools");
menuCatalogs.put("璁剧疆","Set up");
menus.put("灏忓尯绠＄悊","Community");
- menus.put("鎴戠殑灏忓尯","My neighborhood");
- menus.put("灏忓尯澶у睆","Community large screen");
+ menus.put("鎴戠殑灏忓尯","My community");
+ menus.put("灏忓尯澶у睆","Community statistics");
menus.put("涓氬姟鍙楃悊","Business acceptance");
menus.put("鎴垮眿瑁呬慨","House renovation");
- menus.put("缁撴瀯鍥�","Structure diagram");
- menus.put("杞︿綅缁撴瀯鍥�","Parking space structure");
+ menus.put("缁撴瀯鍥�","Room structure");
+ menus.put("杞︿綅缁撴瀯鍥�","Parking structure");
menus.put("浜ф潈鐧昏","Property registration");
- menus.put("瑙嗛鐩戞帶","Video Surveillance");
+ menus.put("瑙嗛鐩戞帶","Video");
menus.put("璧勪骇绠＄悊","Asset");
- menus.put("妤兼爧淇℃伅","Building");
+ menus.put("妤兼爧淇℃伅","Floor");
menus.put("鍗曞厓淇℃伅","Unit");
- menus.put("鎴垮眿绠＄悊","Housing");
+ menus.put("鎴垮眿绠＄悊","Room");
menus.put("鍟嗛摵绠＄悊","Shop");
menus.put("涓氫富绠＄悊","Owner");
menus.put("涓氫富淇℃伅","Owner");
menus.put("涓氫富鎴愬憳","Owner members");
menus.put("缁戝畾涓氫富","Bind the owner");
menus.put("涓氫富璐﹀彿","Owner account");
- menus.put("璐圭敤绠＄悊","Expense");
- menus.put("璐圭敤椤硅缃�","Expense item settings");
- menus.put("鎴垮眿鏀惰垂","Housing charges");
- menus.put("杞﹁締鏀惰垂","Vehicle charges");
+ menus.put("璐圭敤绠＄悊","Fee");
+ menus.put("璐圭敤椤硅缃�","Fee settings");
+ menus.put("鎴垮眿鏀惰垂","Room charges");
+ menus.put("杞﹁締鏀惰垂","Car charges");
menus.put("鍚堝悓鏀惰垂","Contract charges");
- menus.put("璐﹀崟鍌即","Bill payment");
- menus.put("璐圭敤瀵煎叆","Cost import");
+ menus.put("璐﹀崟鍌即","Bill fee");
+ menus.put("璐圭敤瀵煎叆","Fee import");
menus.put("鍛樺伐鏀惰垂","Staff charges");
menus.put("璐圭敤姹囨�昏〃","Summary of Fees");
- menus.put("閫�璐瑰鏍�","Refund review");
- menus.put("娆犺垂淇℃伅","Arrears");
+ menus.put("閫�璐瑰鏍�","Refund audit");
+ menus.put("娆犺垂淇℃伅","Owe fee");
menus.put("鎶勮〃绫诲瀷","Meter reading type");
menus.put("姘寸數鎶勮〃","Water and electricity meter");
- menus.put("琛ユ墦鏀舵嵁","Make-up receipt");
- menus.put("鍏憡鍏紡","Public share formula");
+ menus.put("琛ユ墦鏀舵嵁","Reprint receipt");
+ menus.put("鍏憡鍏紡","Public area formula");
menus.put("缂磋垂瀹℃牳","Payment audit");
menus.put("鎶樻墸璁剧疆","Discount settings");
- menus.put("浼樻儬鐢宠","Concession application");
- menus.put("浼樻儬绫诲瀷","Offer type");
+ menus.put("浼樻儬鐢宠","Discount apply");
+ menus.put("浼樻儬绫诲瀷","Discount type");
menus.put("涓存椂杞︽敹璐�","Temporary car charges");
- menus.put("涓存椂杞︾即璐规竻鍗�","Temporary car payment checklist");
- menus.put("鍙栨秷璐圭敤","Cancellation fee");
- menus.put("鏅烘収鍋滆溅","Smart parking");
- menus.put("鍋滆溅鍦虹鐞�","Parking lot");
- menus.put("杞︿綅淇℃伅","Parking");
+ menus.put("涓存椂杞︾即璐规竻鍗�","Temporary car fee");
+ menus.put("鍙栨秷璐圭敤","Cancel fee");
+ menus.put("鏅烘収鍋滆溅","Parking");
+ menus.put("鍋滆溅鍦虹鐞�","Parking area");
+ menus.put("杞︿綅淇℃伅","Parking space");
menus.put("宀椾涵绠＄悊","Booth");
- menus.put("涓氫富杞﹁締","Owner vehicle");
- menus.put("杩涘満璁板綍","Approach record");
- menus.put("鍦ㄥ満杞﹁締","Vehicles present");
+ menus.put("涓氫富杞﹁締","Owner car");
+ menus.put("杩涘満璁板綍","inout record");
+ menus.put("鍦ㄥ満杞﹁締","car present");
menus.put("榛戠櫧鍚嶅崟","Black and white list");
menus.put("鍓╀綑杞︿綅","Remaining parking spaces");
- menus.put("杞︿綅鐢宠","Application for parking space");
+ menus.put("杞︿綅鐢宠","apply parking space");
menus.put("鎶ヤ慨绠＄悊","Repair");
menus.put("鎶ヤ慨璁剧疆","Repair settings");
menus.put("鐢佃瘽鎶ヤ慨","Telephone repair");
- menus.put("宸ュ崟姹�","Ticket pool");
+ menus.put("宸ュ崟姹�","Repair pool");
menus.put("鎶ヤ慨寰呭姙","Repair pending");
menus.put("鎶ヤ慨宸插姙","Repair has been done");
menus.put("鎶ヤ慨鍥炶","Repair visit");
@@ -144,10 +171,10 @@
menus.put("鍚堝悓绠＄悊","Contract");
menus.put("鍚堝悓绫诲瀷","Type of contract");
menus.put("鍚堝悓鐢叉柟","Party A");
- menus.put("璧疯崏鍚堝悓","Drafting contracts");
- menus.put("鍚堝悓鏌ヨ","Contract query");
- menus.put("鍚堝悓鍙樻洿","Contract changes");
- menus.put("鍒版湡鍚堝悓","Expired contract");
+ menus.put("璧疯崏鍚堝悓","Create contracts");
+ menus.put("鍚堝悓鏌ヨ","Query contract");
+ menus.put("鍚堝悓鍙樻洿","Changes contract ");
+ menus.put("鍒版湡鍚堝悓","Contract expired ");
menus.put("鎶ヨ〃绠＄悊","Report");
menus.put("鎶ヨ〃涓撳","Report Specialist");
menus.put("妤兼爧璐圭敤琛�","Building fee schedule");
@@ -231,5 +258,74 @@
menus.put("鍘嗗彶缂磋垂瀵煎叆","Import history fee");
menus.put("鎵撳嵃閰嶇疆","Print configuration");
menus.put("鏀舵嵁妯℃澘","Receipt template");
+ menus.put("鍩虹鏁版嵁","Basic data");
+ menus.put("灏忓尯淇℃伅","Community information");
+ menus.put("鐗╀笟鍏徃","Property company");
+ menus.put("鍛ㄨ竟鍟嗗","Surrounding businesses");
+ menus.put("鍏ラ┗瀹℃牳","Check in");
+ menus.put("绉熻祦绠＄悊","Rental");
+ menus.put("绉熻祦閰嶇疆","Rental configuration");
+ menus.put("鎴挎簮淇℃伅","Listing information");
+ menus.put("鍑虹瀹℃牳","Rental audit");
+ menus.put("绉熻祦棰勭害","Rental appointment");
+ menus.put("鍑虹鍘嗗彶","Rental history");
+ menus.put("鏅烘収杩愯惀","Smart operation");
+ menus.put("鏃ц揣鐢╁崠","Thrift sale");
+ menus.put("鍙戝竷闇�姹�","Release requirements");
+ menus.put("鍒朵綔浼樻儬鍒�","Create coupons");
+ menus.put("璐拱璁板綍","Purchase history");
+ menus.put("鍟嗗搴楅摵","Merchant shop");
+ menus.put("鍟嗗煄鑿滃崟","Mall menu");
+ menus.put("寮�搴楀鏍�","Shop audit");
+ menus.put("搴楅摵淇℃伅","Store nformation");
+ menus.put("灏忓尯搴楅摵","Community shop");
+ menus.put("涓撳尯鐩綍","Zone directory");
+ menus.put("涓撳尯鍟嗗搧","Zone products");
+ menus.put("搴楅摵绫诲瀷","Store type");
+ menus.put("涓婃灦鏈嶅姟","Shelf service");
+ menus.put("涓婃灦鍟嗗搧","Listings");
+ menus.put("搴楅摵鍙樻洿","Store change");
+ menus.put("璐㈠姟绠＄悊","Financial management");
+ menus.put("鎻愮幇瀹℃牳","Withdrawal audit");
+ menus.put("鎻愮幇浠樻","Withdrawal payment");
+ menus.put("鎻愮幇璁板綍","Withdrawals record");
+ menus.put("璁剧疆淇濊瘉閲�","Set margin");
+ menus.put("淇濊瘉閲戞槑缁�","Margin details");
+ menus.put("鍟嗘埛绠＄悊","Merchant management");
+ menus.put("鍟嗘埛绠＄悊鍛�","Merchant administrator");
+ menus.put("钀ラ攢涓績","Marketing center");
+ menus.put("鍙戝竷骞垮憡","release ad");
+ menus.put("渚挎皯鑿滃崟缁存姢","Convenience menu maintenance");
+ menus.put("璁㈠崟涓績","Order center");
+ menus.put("鍙楃悊鍗�","Receipt");
+ menus.put("鐧诲綍鏃ュ織","Login log");
+ menus.put("鍟嗗煄璁㈠崟","Mall order");
+ menus.put("閫�璐ц鍗�","Return order");
+ menus.put("鏈嶅姟绠＄悊", "Service management");
+ menus.put("搴旂敤淇℃伅","Application nformation");
+ menus.put("鏈嶅姟淇℃伅","Service information");
+ menus.put("鏈嶅姟娉ㄥ唽","Service registration");
+ menus.put("鏈嶅姟瀹炵幇","Service implementation");
+ menus.put("鏈嶅姟鎻愪緵","Service provision");
+ menus.put("涓氬姟杞ㄨ抗","Business track");
+ menus.put("鑿滃崟绠＄悊","Menu");
+ menus.put("鑿滃崟鐩綍","Menu list");
+ menus.put("鑿滃崟缁�","Menu group");
+ menus.put("鑿滃崟缁存姢","Menu maintenance");
+ menus.put("鏄犲皠绠＄悊","Mapping");
+ menus.put("缂栫爜鏄犲皠","Encoding map");
+ menus.put("灞炴�х鐞�","Attributes");
+ menus.put("灞炴��","Attributes");
+ menus.put("鎶ヨ〃寮�鍙�","Report development");
+ menus.put("鎶ヨ〃缁�","Report group");
+ menus.put("鎶ヨ〃淇℃伅","Report information");
+ menus.put("鎶ヨ〃缁勪欢","Report component");
+ menus.put("缂撳瓨绠＄悊","Cache management");
+ menus.put("鍒锋柊缂撳瓨","Flush cache");
+ menus.put("瀹氭椂浠诲姟绠＄悊","Scheduled task");
+ menus.put("瀹氭椂浠诲姟","Scheduled task");
+ menus.put("鏃ュ織涓績","Log center");
+ menus.put("浜や簰鏃ュ織","Interaction log");
+ menus.put("鍒濆鍖栧皬鍖�","Initialize community");
}
}
--
Gitblit v1.8.0