From cc9ebffc57e6343745cb1eadc47360d6107936bc Mon Sep 17 00:00:00 2001 From: xpc <1821349743@qq.com> Date: 星期二, 30 一月 2024 19:04:26 +0800 Subject: [PATCH] commit --- product-server-web/doc/系统设计 | 139 ++++++++++++++++++++++----------------------- 1 files changed, 68 insertions(+), 71 deletions(-) diff --git "a/product-server-web/doc/\347\263\273\347\273\237\350\256\276\350\256\241" "b/product-server-web/doc/\347\263\273\347\273\237\350\256\276\350\256\241" index 1be3fcf..646f339 100644 --- "a/product-server-web/doc/\347\263\273\347\273\237\350\256\276\350\256\241" +++ "b/product-server-web/doc/\347\263\273\347\273\237\350\256\276\350\256\241" @@ -1,8 +1,5 @@ 锘跨増鏈帶鍒讹細 褰撳墠浜у搧鐗堟湰1.0.0 - 琛嶇敓椤圭洰鐗堟湰 - 1.1.0 picc锛堢坏闃充汉淇濓級 - 1.2.0 xn 璇︾粏瑙i噴 锛�1锛夌洰鍓嶇殑鐗堟湰鍙峰叡鏈�3绾э紝鏍囧噯鐗堟寜鐓�1.0.0 锛�2锛夌涓�浣嶄綔涓轰骇鍝佸ぇ鐗堟湰 @@ -16,7 +13,7 @@ 蹇呴』閰嶇疆榛樿鐨勬暟鎹簮锛屽悕绉板繀椤讳负default,瑙乤pplication.properties sourceName=default 2.琛ㄨ璁� - id瀛楁: 绫诲瀷=bigint 锛岄暱搴�11 + id瀛楁: 绫诲瀷=bigint 锛岄暱搴�11 uuid瀛楁銆乽uid寮曠敤瀛楁锛氾紝闀垮害閮芥槸80 瀛楁绫诲瀷闄や簡閫氱敤String...澶栵紝杩樻湁涓�涓被鍨�:parentuuid,鐢ㄦ瀛楁琛ㄧず涓诲瓙琛ㄧ殑鍏崇郴锛� 鍚屾椂杩樺繀椤婚厤鍏宠仈鐨勭埗琛ㄥ悕绉帮紝鍚屼竴涓叧鑱旂埗琛紝鍙兘閰嶄竴涓猵arentuuid绫诲瀷鐨勫瓧娈碉紝濡傛灉鏄櫘閫氫富澶栭敭鍏宠仈锛屽氨涓嶇敤parentuuid @@ -27,13 +24,13 @@ ...... function_uuid parentuuid mrbase_sys_datamodel_table(淇濆瓨琛ㄧ殑uuid锛屾樉绀鸿〃鐨勫悕绉帮紝榛樿鍏宠仈涓昏〃鐨剈uid) 瀛楁鐨勯暱搴︿负涓嬫媺閫夋嫨锛屾牴鎹笉鍚岀殑鏁版嵁绫诲瀷锛屽畾涔変笉鍚岀殑闀垮害閫夐」锛屽锛�10銆�20銆�50銆�100绛� - + 瀛楁绫诲瀷锛� 闄ゆ爣鍑嗙殑string datetime int double ,杩樻湁鐗规畩锛歱arentuuid(涓诲瓙琛ㄥ叧绯伙紝璁板綍鐖惰〃uuid)銆乧ode(缂栫爜瀛楁 000-000-002)銆乻erialNumber(GXD201209020001) 瀛楁绫诲瀷=parentuuid鏃讹紝蹇呴』field_relation_table瀛楁濉啓鐖惰〃鐨剈uid鍚﹀垯涔熶笉鑳戒綔涓轰富瀛愯〃淇濆瓨 - + 鎵�鏈夌被鍨嬶細string銆乮nt銆乶umber(灏忔暟)銆乨atetime銆乸arentuuid銆乧ode銆乻erialNumber銆乮dcard銆乽rl銆乮p銆乵ac銆乪mail銆乽serid銆乷rgUuid銆乫ile銆乫lowStatus銆乼able_name - + 3.缂撳瓨鏁版嵁 * 缂撳瓨閰嶇疆琛細SYS_CACHE_CONFIG * 瀛楁锛欼D銆乽uid銆乧ache_name銆乀ABLENAME(S200)銆丆ACHEFIELD(鍒嗙骇缂撳瓨瀛楁锛岄�楀彿鍒嗛殧),FIELDS(S4000,瀛楁鍚嶏紝閫楀彿鍒嗛殧)銆乫ilter(S4000)銆佸娉ㄨ鏄�.... @@ -50,10 +47,10 @@ table_name=mrbase_sys_datamodel_field | cache_fields=* | group_field=table_uuid table_name=mrbase_sys_datamodel_field | cache_fields=* | filter=field_type='parentUuid' table_name=mrbase_function_permission | cache_fields=role_uuid,function_uuid,button_uuid | group_field=role_uuid - + *缂撳瓨鍒锋柊锛屾暟鎹柊澧炪�佷慨鏀广�佸垹闄ゆ椂閮戒細鍒锋柊瀵瑰簲鐨勮琛ㄧ殑鎵�鏈夌紦瀛橀厤缃紝杩樺彲浠ヨ皟鑷畾涔夌殑浠g爜杩涜鍒锋柊锛坆ean_name銆乥ean_method(String uuid) 鍙傛暟鏄搷浣滄暟鎹殑uuid ,bean_method() 鍚姩鏃朵細璋冩鏂规硶锛屽繀椤诲畾涔変袱涓柟娉� 锛� *缂撳瓨鐨勪娇鐢ㄦ煡璇㈡柟娉曪細 - 鏈夊垎缁勶紝鍒嗙粍瀛楁锛屽搴斿�� + 鏈夊垎缁勶紝鍒嗙粍瀛楁锛屽搴斿�� 瀵瑰簲缂撳瓨涓搴旂殑鍒嗙粍瀛楁锛屾暣涓弬鏁颁负杩欙紝琛ㄧず娌℃湁鍒嗙粍锛屽彧鑳藉悗闈笉涓虹┖锛屼笉鑳藉墠闈负绌猴紝渚嬪锛� 缂撳瓨鐨勫垎缁勫瓧娈碉細field1銆乫ield2銆乫ield3 ,鑾峰彇鏃跺弬鏁板�硷紝鍙兘涓夌鎯呭喌锛歿value1,null,null}銆亄value1,value2,null}銆亄value1,value2,value2}, 涓嶈兘鍑虹幇 {value1,null,value3} 銆亄null,null,value3} 銆亄null,value2,value3} 绛夋儏鍐� @@ -87,7 +84,7 @@ 鍙湁鍒犻櫎鏃剁敤杩欎釜瀛楁鏉ュ尯鍒�,鍗硚type~=del 淇敼涓诲瓙琛ㄦ暟鎹� 涓昏〃蹇呴』鏈塽uid瀛楁锛屽瓙琛ㄦ暟鎹腑涓変釜绉嶆儏鍐碉細鏂板 ~type~="",uuid="",淇敼锛殈type~="",uuid="涓嶄负绌�"锛屽垹闄わ細~type~="del",uuid="涓嶄负绌�" 瀛愯〃鍒楁暟瑕佷竴鑷� - + 5.鎵�鏈夊疄浣撶被鍨嬶紝閮藉繀椤绘湁涓瓧娈� table_name锛屽瓨琛ㄥ悕绉� ,鍙互瀹炰綋绫讳腑瀹氫箟鎴愬父閲� 6.API璇锋眰鍙傛暟 @@ -95,7 +92,7 @@ RequestParameterEntity 灏佽鎵�鏈夊弬鏁拌姹傦紝璇︾粏瑙佽绫� Object bean=request.getAttribute("requestPara"); String accessToken = null; - if(bean !=null) { + if(bean !=null) { RequestParameterEntity reqp=(RequestParameterEntity)bean; accessToken=reqp.getToken(); } @@ -114,7 +111,7 @@ 鏌ヨ杩斿洖 OK_List(FieldSetEntity fs) OK_List(DataTableEntity dt) - + 閫氱敤閿欒杩斿洖锛� 鏂板銆佷慨鏀广�佸垹闄ゃ�佹煡璇㈠け璐� public String error(String code,String msg ) @@ -124,8 +121,8 @@ */ @Autowired public BaseDao baseDao = null; - -10.~table~ 鍙傛暟鍦ㄦ柊澧炪�佷慨鏀规帴鍙f椂蹇呴』鏀惧埌鏁版嵁鐨勫墠闈紝浠ユ鏉ラ鍏堣幏鍙栧埌 + +10.~table~ 鍙傛暟鍦ㄦ柊澧炪�佷慨鏀规帴鍙f椂蹇呴』鏀惧埌鏁版嵁鐨勫墠闈紝浠ユ鏉ラ鍏堣幏鍙栧埌 13.楂樼骇鍙傜収涓嬫媺妗嗘帴鍙f暟鎹� { @@ -158,16 +155,16 @@ 鍏朵腑filter瀛楁锛屾槸閰嶇疆浜哄憳鎵嬪啓鐨剆ql鏉′欢锛屽瓧绗︿覆涓彲鑳介厤缃姩鎬佸弬鏁帮紝鏍煎紡涓猴細~鍙傛暟鍚嶇О~锛屽墠绔皟鐢ㄦ鍙傜収鏃讹紝涔熷繀椤讳紶瀵瑰簲鐨勫弬鏁板�� 锛屼緥濡傦細 閰嶇疆filter: uuid=~cust_uuid~ and name like '%~cust_name~%' 鍓嶇鍙傛暟锛歿cust_uuid="sdgeasge",cust_name="涓浗"} - - filter瀛楁涓繕鍙互閰嶇疆绯荤粺鍙橀噺锛屽锛歩s_used=1 and uuid in (select language_uuid from mrbase_sys_company_language where org_level_uuid='{{COMPANY_UUID}}') + + filter瀛楁涓繕鍙互閰嶇疆绯荤粺鍙橀噺锛屽锛歩s_used=1 and uuid in (select language_uuid from mrbase_sys_company_language where org_level_uuid='{{COMPANY_UUID}}') {{COMPANY_UUID}}:褰撳墠鐧诲綍浜哄憳鐨勫叕鍙窾UID. - + display_type锛� 1:鍒楄〃 2:鏍戠粨鏋勶紝褰撶瓑浜�2琛ㄧず姝ゅ弬鐓ф暟鎹樉绀烘爲鍨嬶紝鍚屾椂 code_field銆乸arent_code_field 銆乨elay_load瑕佸繀濉紝 code_field锛氫笂涓嬬骇鍏崇郴琛ㄤ腑鐨� 缂栫爜瀛楁锛�001锛屾瀛楁涔熷鐞嗗悗鏀惧埌select_fields瀛楁涓幓锛氱敓鎴� xxxxx code,姝ゅ墠绔湪鐐瑰嚮涓�涓妭鐐规椂锛屽彇code鐨勫�间紶缁欐帴鍙o紝鎺ヨ繑鍥炲叾涓嬮潰鐨勫瓙鏁版嵁 parent_code_field锛氱埗缂栫爜瀛楁锛�001 org_filter_field锛氭牴鎹〃涓殑鍏徃瀛楁杩涜鏁版嵁杩囨护锛屽涓互閫楀彿鍒嗛殧 usr_filter_field锛氫汉鍛樻暟鎹繃婊ゆ潯浠跺瓧娈碉紝蹇呴』鏄暟鎹簮琛ㄤ腑鐨勪汉鍛樺瓧娈碉紝鍙互澶氫釜锛岄�楀彿鍒嗛殧锛� - + 14.1 涓嬫媺鍙傜収(楂樼骇鍙傜収銆佹暟鎹瓧鍏�)鍦ㄥ垪琛ㄤ腑鏄剧ず锛� 閰嶇疆mrbase_sys_datamodel_field.field_reference瀛楁锛岄厤鍙傜収鍚嶇О鎴栨暟鎹瓧鍏稿悕绉帮紝濡傛灉鏄暟鎹瓧鍏稿悕绉板姞涔﹀悕鍙锋嫭璧锋潵,濡傦細銆奼ender銆� 鍦ㄥ垪琛ㄧ殑鏌ヨ鏂规硶锛屽鍒楄〃鏁版嵁杩涜灏佽涓�娆★細baseDao.loadPromptData(dt); @@ -198,8 +195,8 @@ SystemUser user = SpringMVCContextHolder.getCurrentUser(); 25.鑾峰彇褰撳墠request銆乺eponse銆乻ession绛� SpringMVCContextHolder.getHttpxxxx() - -26.瀵规暟鎹殑鎿嶄綔锛屽彲浠ュ弬鑰冧唬鐮侊細JsonUtil锛屽浣曠敓鎴愮殑 FieldSetEnttiy,濡備綍鍦╢s涓幏鍙栧瓙琛紙DataTableEntity锛夛紝濡備綍鑾峰彇fs涓殑瀛楁鍊硷紝濡備綍鍦―ataTableEntity涓幏鍙栦竴鏉¤褰曪紝鍜屼竴鏉¤褰曚腑鐨勫瓧娈靛�� + +26.瀵规暟鎹殑鎿嶄綔锛屽彲浠ュ弬鑰冧唬鐮侊細JsonUtil锛屽浣曠敓鎴愮殑 FieldSetEnttiy,濡備綍鍦╢s涓幏鍙栧瓙琛紙DataTableEntity锛夛紝濡備綍鑾峰彇fs涓殑瀛楁鍊硷紝濡備綍鍦―ataTableEntity涓幏鍙栦竴鏉¤褰曪紝鍜屼竴鏉¤褰曚腑鐨勫瓧娈靛�� 27.瀵逛竴鏉¤褰曠殑璇诲啓鎿嶄綔 @@ -242,18 +239,18 @@ ----------------------------------------------------------------- controller涓殑鍏蜂綋璋冪敤锛� 鎶� systemClientsService.addClient(fse); 鏀规垚浠ヤ笅浠g爜 - + /**浜嬪姟澶勭悊瀹炵幇**/ ISystemClientsService service=(ISystemClientsService)getProxyInstance(systemClientsService); String uuid = service.addClient(fse); - + ISystemClientsService 锛歴ervice绫荤殑鎺ュ彛绫� systemClientsService锛歴pring娉ㄥ叆鐨剆ervice绫� - ------------------------------------------------------------------- - + ------------------------------------------------------------------- + 30.鏌ヨ鍒楄〃涓寘鍚瓙琛ㄦ暟鎹� /** - * + * * @param tableName * @param filter * @param para @@ -269,7 +266,7 @@ /** - * @ 鏌ヨ鍒楄〃鏁版嵁鐨勬墍鏈夊瓙琛ㄦ暟鎹� String 1=姣忔潯璁板綍uuid锛孲tring 2= 瀛愯〃鍚嶇О + * @ 鏌ヨ鍒楄〃鏁版嵁鐨勬墍鏈夊瓙琛ㄦ暟鎹� String 1=姣忔潯璁板綍uuid锛孲tring 2= 瀛愯〃鍚嶇О * @param uuids 閫楀彿鍒嗛殧 鐖跺垪琛╱uids * @param table_name * @return @@ -278,18 +275,18 @@ 31.鍏充簬闄勪欢鑾峰彇鎿嶄綔 RequestParameterEntity.getFormData().getString(闄勪欢瀛楁);//涓婁紶鐨勫師濮嬫枃浠跺悕锛屽涓互閫楀彿鍒嗛殧 RequestParameterEntity.getFiles().get(鍘熷鏂囦欢鍚�); //瀵瑰簲鐨勬枃浠讹紝鏂囦欢鍚嶏細uuid+"_"+鏂囦欢鐨勫師濮嬪悕绉� 锛屼竴娆″彧鑳借幏鍙栦竴涓� - + 32.鍏充簬鎵嬪啓sql璇彞鏌ヨ鍜屽垎椤电殑瑕佹眰 select TIMESTAMPDIFF(YEAR,aciwe.start_datetime,aciwe.end_datetime) AS start_datetime from a,b where f1=f2 鎴� a left join b on f1=f2 瀛楁鍒悕蹇呴』鏄〃涓殑瀛楁锛屽惁鍒欐棤娉曡幏鍙栧埌瀵瑰簲瀛楁鐨勮〃鍚嶅拰瀛楁淇℃伅瀹氫箟锛屽锛� start_datetime 蹇呴』鏄� a琛ㄦ垨b琛ㄤ腑鐨勪竴涓瓧娈� - + 澶氳〃鍏宠仈鏌ヨ锛岃〃瀹氫箟锛歛,b 鎴� a left join b on f1=f2 鏁翠釜鍋氫负琛� - 鏉′欢瀹氫箟锛寃here 鍚庨潰 锛� f1=f2 - 33.濡傛煡sql璇彞涓病鏈塽uid瀛楁锛屾棤娉曟煡璇㈠嚭瀛愯〃 - + 鏉′欢瀹氫箟锛寃here 鍚庨潰 锛� f1=f2 + 33.濡傛煡sql璇彞涓病鏈塽uid瀛楁锛屾棤娉曟煡璇㈠嚭瀛愯〃 + 34.绯荤粺閿欒璇存槑 - + 绯荤粺閿欒鍒嗕负涓ょ锛氫富鍔ㄦ姏鍑洪敊璇�佹崟鑾烽敊璇� 涓诲姩鎶涘嚭锛� /** @@ -300,7 +297,7 @@ * @param method 閿欒鍙戠敓鏂规硶 */ public BaseException(String code,String error,Class c,String method); - + 鎹曡幏閿欒: /** * 鏋勯�犲嚱鏁帮紝璁板綍閿欒鍒板簱---鎹曡幏鐨勯敊璇� @@ -308,7 +305,7 @@ * @param exc 鎹曡幏鐨勯敊璇� */ public BaseException(String code,String error,Class c,String method,Exception sysExc) - + 35.licese鏀寔 纭欢淇℃伅璇诲彇搴撴枃浠讹紝涓嬭浇鍦板潃锛歨ttp://sigar.hyperic.com/ windows鐗� mac鐗� linux鐗� @@ -323,7 +320,7 @@ String code=codeService.createCode(fse.getString("table_name"), fse.getString("field_name"), fse.getString("parentCode")==null?"":fse.getString("parentCode")); 鍦ㄦ柊澧炵殑controller涓皟鐢紝鍦ㄥ簳灞侱ao涓殑淇濆瓨鏂规硶涓幏鍙栬幏鍙栫殑涓存椂缂栫爜鍘婚獙璇佹槸鍚﹁鍗犵敤锛屽崰鐢ㄥ垯閲嶆柊鐢熸垚锛屼繚璇佸敮涓�鎬� 杩斿洖json鍊间腑code鐨勫�煎嵆涓虹敓鎴愮殑缂栫爜鍊� - + 37.閫氱敤鍙傛暟楠岃瘉銆佹暟鎹繚瀛橀獙璇� 鍙傛暟楠岃瘉锛歝om.lx..module.sys.config.RegistValidate绫� 鍦╮egistValidateParameter鏂规硶涓坊鍔犻獙璇佷唬鐮侊紝濡傦細 @@ -334,7 +331,7 @@ 鏁版嵁淇濆瓨楠岃瘉锛屽湪core鍖呬腑鐨刣ao涓嚜鍔ㄦ牴鎹暟鎹〃瀛楁鐨勯厤缃獙璇侊紝閫氬父涓嶇敤閰嶏紝浣嗗鏋滄湁鍏跺畠楠岃瘉锛屼篃鍙互鍦ㄤ繚瀛樺拰淇敼鎺ュ彛涓厤缃紝鍚﹀垯淇濆瓨鍜屼慨鏀规帴鍙d笉鐢ㄩ厤 鏍规嵁瀛楁绫诲瀷杩涜楠岃瘉锛屽锛氬瓧娈垫槸mail锛宮rbase_sys_datamodel_field.field_type=email,鐜板彧鏀寔锛� int銆乶umber(灏忔暟)銆乮dcard銆乽rl銆乮p銆乵ac銆乨atetime銆乴ength銆乪mail - + 38.properties閰嶇疆鏂囦欢鍙傛暟鑾峰彇 璋冪敤锛� Global.getPropertyToBoolean("druid.datasource.testOnBorrow", "false") @@ -365,7 +362,7 @@ /** * 鑾峰彇浜哄憳鐨勬暟鎹潈闄愶紝鎬诲叆鍙� 锛岃繃婊ゆ寚瀹氫汉鍛樺瓧娈碉紝浣跨敤榛樿鍏徃瀛楁杩涜杩囨护-org_level_uuid * @tableName 浜哄憳杩囨护鐨勮〃 - * @param staff_fields + * @param staff_fields * @return */ public String getDataFilter(String tableName,String staff_fields) @@ -377,8 +374,8 @@ * @return */ public String getDataFilter(String tableName,String staff_fields,String org_fields) - - 40.鍏充簬娴佹按鍙� + + 40.鍏充簬娴佹按鍙� 鍙渶瑕佸湪閰嶇疆涓厤缃祦姘村彿,瑙佽〃mrbase_sys_swift_config 琛ㄤ腑瀛樻斁娴佹按鍙风殑瀛楁锛屽繀椤诲湪mrbase_sys_datamodel_field琛ㄤ腑璇ュ瓧娈电殑field_type=serialNumber 锛岀ず渚嬭test琛� 鐣岄潰璋冪敤鎺ュ彛鑾峰彇缂栫爜锛�/api/common/createSerialNumber锛岃娴嬭瘯绫籆odeTest锛屽繀浼犲弬鏁帮細serialNumberName锛屽搴旇〃娴佹按鍙烽厤缃〃涓殑swift_config_name瀛楁鍊� @@ -426,7 +423,7 @@ /api/language/load-international-info/{version} 鍔犺浇鎸囧畾瀹㈡埛绔�佺増鏈彿銆侀粯璁よ瑷�鐨勬墍鏈夊浗闄呭寲鏁版嵁 瀹㈡埛绔�佺増鏈彿銆侀粯璁よ瑷�鎺ュ彛鍙傛暟涓婁紶 - + value: 1銆侀鍏堥厤缃〃銆佸瓧娈典负鍥介檯鍖栧瓧娈� 2銆佸墠绔皟鎺ュ彛鑾峰彇鍝簺琛ㄦ湁鍝簺鍥介檯鍖栧瓧娈碉紝鍦ㄧ晫闈㈢殑涓搴斿厓绱犲悗闈㈡坊鍔犲湴鐞冨浘鏍囷紝鐐瑰浘鏍囧脊鍑哄浗闄呭寲褰曞叆 @@ -486,17 +483,17 @@ /** * 涓氬姟浠g爜灞傝皟鐢� * 鑾峰彇涓氬姟瀵瑰簲瀛楁鐨勫浗闄呭寲鏁版嵁,濡傛灉language_code涓嶄负绌猴紝琛ㄦ槑鏄墜鏈虹 - * @param dt 涓氬姟琛ㄦ暟鎹� + * @param dt 涓氬姟琛ㄦ暟鎹� * @param language_code 涓嶄负绌哄垯涓烘墜鏈虹 * @return */ DataTableEntity baseDao.listInternationDataTable(DataTableEntity dt,String language_code ) 灏佽鍥介檯鍖栨暟鎹埌姣忔潯璁板綍鐨勬瘡涓浗闄呭寲瀛楁銆� FieldSetEntity baseDao.listInternationDataTable(FieldSetEntity fs,String language_code ) 灏佽鍥介檯鍖栨暟鎹埌鍗曟潯璁板綍鐨勬瘡涓浗闄呭寲瀛楁銆� - + //baseDao.processInternationDataTable(DataTableEntity dt,String language_code ),鍥介檯鍖栧瓧娈典笉鏄暟缁勬牸寮� //baseDao.processInternationDataTable(FieldSetEntity fs,String language_code ) 鍥介檯鍖栧瓧娈典笉鏄暟缁勬牸寮� 杩斿洖json鏍煎紡锛� - + { 聽聽聽聽"code":"200", 聽聽聽聽"data":[ @@ -528,7 +525,7 @@ 聽聽聽聽"msg":"鎴愬姛", 聽聽聽聽"status":"success" } - + 5銆佷慨鏀逛繚瀛樻暟鎹甹son鏍煎紡锛� { 聽聽聽聽"token":"11111-鏂板鎻愪氦鏁版嵁", @@ -562,7 +559,7 @@ 聽聽聽聽], 聽聽聽聽"phone":"18123938722" } - + 6.涓嶈兘鍥介檯鍖栫殑琛細 mrbase_sys_cache_config 缂撳瓨閰嶇疆 mrbase_sys_data_sources 鏁版嵁搴撹繛鎺ラ厤缃� @@ -649,7 +646,7 @@ 鏍稿績锛氶渶瑕乻igar-amd64-winnt.dll鎴栬�卻igar-x86-winnt.dll鏂囦欢缃簬jdk鐨刡in涓垨鑰卌鐩榳indows/system32 涓婁紶鐩綍閰嶇疆锛岃properties鏂囦欢涓殑upload.file銆倄xxx 鍑犱釜鐩稿叧鍙傛暟 涓婁紶鏂囦欢鑷姩瀛樺埌鐩綍涓嬶紝鍦╟ontroller鎴杝ervice灞備腑璇诲彇鎿嶄綔銆� - + 46.娑堟伅鏈嶅姟 1.鏂板缓闃熷垪 public static void createQueue(String queue_name) @@ -694,9 +691,9 @@ language:value //鍥介檯鍖栬瑷� } 杩斿洖鍊硷細list<String> uuids - + 褰撴煡璇㈣鍚嶏紝浣跨敤澶氳〃鑱斿悎鏌ヨ锛屽苟浣跨敤浜嗗埆鍚嶆椂锛岄渶瑕佹坊鍔犺〃鍒悕銆佸瓧娈靛埆鍚嶈缃紝骞舵妸sql璇彞浣跨敤select * from (鏌ヨ璇彞+鏁版嵁鏉冮檺鏉′欢+楂樼骇鏌ヨ鏉′欢) b 鎷捣鏉ワ紝娉ㄦ剰 - 48.浠ヤ笅鍐呭鍙樻洿 + 48.浠ヤ笅鍐呭鍙樻洿 1.core鍖呭紩鍏ュ彉鏇� <dependency> <groupId>com.lx</groupId> @@ -728,13 +725,13 @@ public String DataTableEntity.getUuids() 鍘� 锛屾敼涓轰互涓� 鎸囧畾琛ㄧ殑鎵�鏈塽uid,杩斿洖鏁扮粍 - -> public Object[] getUuids(Object tableName) + -> public Object[] getUuids(Object tableName) 鎸囧畾琛ㄧ殑鎵�鏈塽uid锛岃繑鍥為�楀彿鍒嗛殧鐨勫瓧绗︿覆 - -> public String getUuidsToString(Object tableName) + -> public String getUuidsToString(Object tableName) 杩斿洖榛樿琛ㄧ殑鎵�鏈塽uid,杩斿洖鏁扮粍 -> public Object[] getUuids() 杩斿洖榛樿琛ㄧ殑鎵�鏈塽uid,杩斿洖閫楀彿鍒嗛殧鐨勫瓧绗︿覆 - -> public String getUuidsToString() + -> public String getUuidsToString() 8.鐧诲綍涓婁紶鍥哄畾鍙傛暟 system_language_code 璇█缂栫爜 zh en system_client_type 瀹㈡埛绫诲瀷 @@ -781,7 +778,7 @@ baseDao.update(DataTableEntity fs,String language_code) 鏁版嵁鏌ヨ锛� FieldSetEntity listInternationDataTable(FieldSetEntity fs,String language_code ) - DataTableEntity listInternationDataTable(DataTableEntity dt,String language_code ) + DataTableEntity listInternationDataTable(DataTableEntity dt,String language_code ) 49.鍚庣閿欒淇℃伅鍥介檯鍖� 1)閿欒淇℃伅鏋氫妇绫绘敞鍏ワ紝鍚姩绫讳腑娣诲姞娉ㄥ叆浠g爜锛� DataPoolCacheImpl.getInstance() @@ -790,11 +787,11 @@ .appendErrorEnumClass("com.lx.base.module.sys.config.SystemErrorCode"); 2)鐗规畩鎯呭喌璋冪敤锛圓bstractBaseController.error()銆丅aseException.getMessage()銆乬etMessageInfo()宸插疄鐜帮級 String message=DataPoolCacheImpl.getInstance().getErrorLanguageInternation(code, language_code); - + 50.楂樼骇鍙傜収鏁版嵁杩斿洖瑙勫垯 1)鎵�鏈夊崟浣嶉珮绾у弬鐓ф暟鎹� f1 鍏ㄧО f2 鐭紪鐮� 2)鎵�鏈夐儴闂ㄩ珮绾у弬鐓ф暟鎹� f1 鍏ㄧО f2 鐭紪鐮� - 3)鎵�鏈夊矖浣嶉珮绾у弬鐓ф暟鎹� f1 鍏ㄧО + 3)鎵�鏈夊矖浣嶉珮绾у弬鐓ф暟鎹� f1 鍏ㄧО 4)鎵�鏈夊矖浣嶇瓑绾ч珮绾у弬鐓ф暟鎹� f1 绛夌骇绾у埆 f2 缁勫悕 5)鎵�鏈夋ā鍧楅珮绾у弬鐓ф暟鎹� f1 鐭紪鐮� 6)鎵�鏈夊姛鑳介珮绾у弬鐓ф暟鎹� f1 鐭紪鐮� @@ -820,7 +817,7 @@ 52.鍔熻兘鏉冮檺楠岃瘉 蹇呴』閰嶇疆mrbase_sys_function_buttons.api_url閰嶇疆鎸夐挳瀵瑰簲鍚庣鎺ュ彛鍦板潃锛屽涓�楀彿鍒嗛殧,涓嶈兘鍚増鏈彿锛屽锛� 鎺ュ彛鍦板潃锛�/api/management/delete-user/v1 閰嶇疆鍦板潃锛�/api/management/delete-user - + 53.鏁版嵁鎿嶄綔鏉冮檺楠岃瘉 涓昏閽堝鍗曟潯鏁版嵁鐨勫垹 銆佹敼 銆佹煡鎿嶄綔锛屽湪鍒� 銆佹敼 銆佹煡鐨勭浉搴旀帴鍙h皟鐢� 蹇呴』璁剧疆mrbase_sys_datamodel_field.field_type,userid锛氬瓨鏀句汉鍛樼殑瀛楁绫诲瀷锛宱rgUuid锛氬瓨鏀剧粍缁囨満鏋勭殑瀛楁绫诲瀷 @@ -837,7 +834,7 @@ /** * 瀵瑰崟鏉℃暟鎹繘琛屾搷浣滅殑鏉冮檺楠岃瘉 * @param fs 涓婁紶鏁版嵁锛屽繀椤诲寘鍚〃鍚� uuid ,鍚︿竴寰嬮�氳繃 - * @param type 楠岃瘉绫诲瀷 1=浜哄憳楠岃瘉 2= 绾х粐鏈烘瀯楠岃瘉 3 涓よ�呴兘楠岃瘉 + * @param type 楠岃瘉绫诲瀷 1=浜哄憳楠岃瘉 2= 绾х粐鏈烘瀯楠岃瘉 3 涓よ�呴兘楠岃瘉 * @return */ public boolean validDataPermission(FieldSetEntity fs ,int type) @@ -845,14 +842,14 @@ * 瀵瑰崟鏉℃暟鎹繘琛屾搷浣滅殑鏉冮檺楠岃瘉 ,鐗规畩鏉冮檺鏉′欢 锛屼笉鏍规嵁浜� 缁勭粐鏈烘瀯杩囨护 * @param tableName 琛ㄥ悕 * @param uuid uuid - * @param filter 鐗规畩鏉冮檺鏉′欢 + * @param filter 鐗规畩鏉冮檺鏉′欢 * @return */ public boolean validDataPermission(String tableName,String uuid,String filter) /** * 瀵瑰崟鏉℃暟鎹繘琛屾搷浣滅殑鏉冮檺楠岃瘉 ,鐗规畩鏉冮檺鏉′欢 锛屼笉鏍规嵁浜� 缁勭粐鏈烘瀯杩囨护 * @param fs 涓婁紶鏁版嵁锛屽繀椤诲寘鍚〃鍚� uuid ,鍚︿竴寰嬮�氳繃 - * @param filter 鐗规畩鏉冮檺鏉′欢 + * @param filter 鐗规畩鏉冮檺鏉′欢 * @return */ public boolean validDataPermission(FieldSetEntity fs ,String filter) @@ -863,7 +860,7 @@ SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText()); return this.error(SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getValue(), SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText()); } - + 4)鎸変汉鍛樸�佺粍缁囨満鏋勯獙璇佹暟鎹潈闄愯皟鐢ㄧず渚� 蹇呴』璁剧疆mrbase_sys_datamodel_field.field_type,userid锛氬瓨鏀句汉鍛樼殑瀛楁绫诲瀷锛宱rgUuid锛氬瓨鏀剧粍缁囨満鏋勭殑瀛楁绫诲瀷 if(!permissionService.validDataPermission(fse,CoreConst.DATA_PERMISSION_VALID_TYPE_ALL)) { @@ -879,7 +876,7 @@ this.staffBusinessService.addBalance(fs); this.logger.info(" "); } - + 54.娑堟伅鐢熸垚 /** * 鎵�鏈夊簲鐢ㄦ湇鍔$敓鎴愭秷鎭皟浜涙柟娉曞幓娣诲姞娑堟伅 @@ -890,30 +887,30 @@ * @param content 娑堟伅鍐呭 涓嶅繀濉� * @param title 娑堟伅鏍囬 蹇呭~ * @param send_user_id 娑堟伅鍙戦�佷汉 蹇呭~ - * @param message_type 娑堟伅绫诲瀷 蹇呭~ + * @param message_type 娑堟伅绫诲瀷 蹇呭~ * @param url 娑堟伅閾炬帴鍦板潃 涓嶅繀濉� * @param source_table 涓氬姟鏁版嵁琛� 涓嶅繀濉� * @param source_uuid 涓氬姟鏁版嵁琛╱uid 涓嶅繀濉� - * @param create_by 鍒涘缓浜� userid 蹇呭~ + * @param create_by 鍒涘缓浜� userid 蹇呭~ * @param is_send_mail 鏄惁鍙戦�侀偖浠� 0:鍚� 1锛氭槸 蹇呭~ * @param is_send_sms 鏄惁鍙戦�佺煭淇� 0:鍚� 1锛氭槸 蹇呭~ */ - WebsocketMesssageServiceThread.getInstance().appendMessage(String ....); - + WebsocketMesssageServiceThread.getInstance().appendMessage(String ....); + //娑堟伅绫诲瀷 //琛ㄥ悕甯搁噺瀹氫箟 - public static final int MESSAGE_TOP_TYPE_SYSTEM =1; //"绯荤粺娑堟伅"; + public static final int MESSAGE_TOP_TYPE_SYSTEM =1; //"绯荤粺娑堟伅"; public static final int MESSAGE_TYPE_ANNOUNCEMENT =11; //"鍏憡娑堟伅"; - + public static final int MESSAGE_TOP_TYPE_TASK =2; //"浠诲姟娑堟伅"; - public static final int MESSAGE_TYPE_APPROVE =21; //"寰呭姙娑堟伅"; + public static final int MESSAGE_TYPE_APPROVE =21; //"寰呭姙娑堟伅"; public static final int MESSAGE_TYPE_COORDINATION =22; //"鍗忓悓娑堟伅"; public static final int MESSAGE_TYPE_TASK = 23;// "浠诲姟妯″潡娑堟伅"; public static final int MESSAGE_TOP_TYPE_WARNING =3; //"棰勮娑堟伅"; public static final int MESSAGE_TYPE_WARNING =31; //"棰勮娑堟伅"; - -55.瀛愯〃鎺掑簭瑙勫垯,涓嫭鍙峰唴琛ㄧず瀛愯〃鎺掑簭 鏀惧埌orderby鍙傛暟涓� + +55.瀛愯〃鎺掑簭瑙勫垯,涓嫭鍙峰唴琛ㄧず瀛愯〃鎺掑簭 鏀惧埌orderby鍙傛暟涓� String s="main_field1,main_field2,{sub_table1:sub_table1_field1 desc,sub_table1_field2},{sub_table2:sub_table2_field1 desc,sub_table2_field2}" 56.閿欒淇℃伅涓殑鍔ㄦ�佸彉閲忔浛鎹� 鏇垮垯浣跨敤{}鎶婂彉閲忓悕鎷捣鏉ワ紝姝ゅ彉閲忓悕灏嗗湪Exception涓幏鍙栵細DATA_VERIFY_UNIQUE_ERROR("鏁版嵁涓嶆槸鍞竴锛歿value}", ModuleEnum.CORE.getValue() + "097"), @@ -924,7 +921,7 @@ 56.鍙嶅皠寮曠敤bean :com.product.core.util.ReflectUtil /** - * + * * @param beanName 琚唬鐞嗗鍍廱ean 鍚嶇О * @param methodName 鏂规硶鍚嶇О * @param objects 鍙傛暟 @@ -961,7 +958,7 @@ jar閮ㄧ讲锛氭墦寮�宸ョ▼鐨刾om.mxl,鍙抽敭->Run as -> Maven install->杩涘叆宸ョ▼鐩綍->target鐩綍->copy 鎶婂畬鍖呯殑宸ョ▼jar锛屾斁鍒版湇鍔″櫒鐨勮繍琛岀洰褰曚笅鐨刲ib鐩綍涓嬶紙渚嬪200涓婏細D:\LXServer\product-server\lib锛� 鍓嶇鏂囦欢閮ㄧ讲锛氳繘鍏x-web骞惰繍琛宲acked.bat锛岄噸鏂扮敓鎴恉ist鐩綍->杩涘叆dist鐩綍copy闄aseUrl.js浠ュ鐨勬墍鏈夋枃浠讹紝鏀惧埌鏈嶅姟鍣ㄧ殑杩愯鐩綍涓嬬殑web鐩綍涓嬨�� 閲嶅惎锛堣繍琛屾闈㈠揩鎹烽敭锛� - + 60.鍒嗛〉鏌ヨsql select '6973' as staff_uuid 杩欑娌℃湁from鐨勮鍙�,瑕佹坊鍔� from dual锛屽惁鍒欏垎椤垫煡璇細鍑洪敊 -- Gitblit v1.9.2