From 52b61fce22f188e37a88c20740e005ff109637a7 Mon Sep 17 00:00:00 2001 From: hsy <1029150275@qq.com> Date: 星期一, 17 八月 2026 15:02:27 +0800 Subject: [PATCH] dos: 新增表：mes_pro_task_pause_record --- docs/mes_dv_metering_frontend_integration.md | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/docs/mes_dv_metering_frontend_integration.md b/docs/mes_dv_metering_frontend_integration.md new file mode 100644 index 0000000..75dddc8 --- /dev/null +++ b/docs/mes_dv_metering_frontend_integration.md @@ -0,0 +1,116 @@ +# MES 璁￠噺鍣ㄥ叿涓庤閲忔娴嬭褰� - 鍓嶇鑱旇皟鏂规 + +## 娑夊強椤甸潰 + +| 椤甸潰 | 鑿滃崟璺緞 | 璺敱璺緞 | component_name | +|------|----------|----------|----------------| +| 璁￠噺鍣ㄥ叿 | 璁惧绠＄悊 -> 璁￠噺鍣ㄥ叿 | `mes/dv/metering/index` | MesDvMetering | +| 璁￠噺妫�娴嬭褰� | 璁惧绠＄悊 -> 璁￠噺妫�娴嬭褰� | `mes/dv/meteringcheck/index` | MesDvMeteringCheck | + +> 涓や釜椤甸潰涓哄钩绾ц彍鍗曘�傛娴嬭褰曢〉鍙�氳繃銆岃閲忓櫒鍏枫�嶄笅鎷夌瓫閫夛紝浠呮煡鐪嬫煇鍙板櫒鍏风殑妫�娴嬪巻鍙层�� + +## 涓氬姟娴佺▼涓庢暟鎹甫鍏� + +1. 璁￠噺鍣ㄥ叿鍒楄〃 -> 鏂板/缂栬緫琛ㄥ崟锛氬綍鍏ュ櫒鍏风紪鐮併�佸悕绉般�佺被鍒�佹牎鍑嗗懆鏈熴�佷娇鐢ㄩ儴闂ㄣ�佽矗浠讳汉绛夈�� +2. 璁￠噺妫�娴嬭褰� -> 鏂板/缂栬緫琛ㄥ崟锛氶�夋嫨銆岃閲忓櫒鍏枫�嶏紙浠� `/mes/dv/metering/simple-list` 甯﹀叆 `meteringId`銆乣code`銆乣name`锛夈�� +3. 妫�娴嬭褰曚繚瀛樺悗锛屽悗绔嚜鍔ㄨ绠� `nextCheckDate` 骞�**鍥炲啓**鍒拌閲忓櫒鍏风殑 `lastCheckDate`銆乣nextCheckDate`锛� + - `nextCheckDate` 浼犵┖鏃� = `checkDate + 鏍″噯鍛ㄦ湡(鏈�)`锛堣嚜鍔ㄨ绠楋級锛� + - `nextCheckDate` 浼犲�兼椂 = 浠ヤ紶鍏ュ�间负鍑嗭紙鎵嬪姩鎸囧畾锛夈�� +4. 璁￠噺鍣ㄥ叿鍒楄〃灞曠ず `expireStatus` 鍒版湡鐘舵�佹爣璁帮紝鐢卞悗绔寜 `nextCheckDate` 涓庡叏灞�閰嶇疆鐨勬彁閱掑ぉ鏁拌绠椼�� + +## API + +### 璁￠噺鍣ㄥ叿 + +| 鏂规硶 | 璺緞 | 璇存槑 | 鏉冮檺 | +|------|------|------|------| +| POST | /mes/dv/metering/create | 鍒涘缓璁￠噺鍣ㄥ叿 | mes:dv-metering:create | +| PUT | /mes/dv/metering/update | 鏇存柊璁￠噺鍣ㄥ叿 | mes:dv-metering:update | +| DELETE | /mes/dv/metering/delete?id= | 鍒犻櫎璁￠噺鍣ㄥ叿锛堟湁鍏宠仈妫�娴嬭褰曟椂鎷掔粷锛� | mes:dv-metering:delete | +| GET | /mes/dv/metering/get?id= | 鑾峰緱璁￠噺鍣ㄥ叿璇︽儏 | mes:dv-metering:query | +| GET | /mes/dv/metering/page | 璁￠噺鍣ㄥ叿鍒嗛〉 | mes:dv-metering:query | +| GET | /mes/dv/metering/export-excel | 瀵煎嚭 Excel | mes:dv-metering:export | +| GET | /mes/dv/metering/simple-list | 绮剧畝鍒楄〃锛堜笅鎷夐�夐」锛� | mes:dv-metering:query | + +**鍒嗛〉绛涢�夊弬鏁帮紙page 鎺ュ彛锛夛細** + +| 鍙傛暟 | 绫诲瀷 | 蹇呭～ | 璇存槑 | +|------|------|------|------| +| code | String | 鍚� | 鍣ㄥ叿缂栫爜妯＄硦 | +| name | String | 鍚� | 鍣ㄥ叿鍚嶇О妯＄硦 | +| brand | String | 鍚� | 鍝佺墝/鐢熶骇鍘傚妯＄硦 | +| category | Integer | 鍚� | 鍣ㄥ叿绫诲埆锛堝瓧鍏革級 | +| deptId | Long | 鍚� | 浣跨敤閮ㄩ棬 | +| chargeUserId | Long | 鍚� | 璐ｄ换浜� | +| status | Integer | 鍚� | 鐘舵�侊紙瀛楀吀锛� | +| expireStatus | Integer | 鍚� | 鍒版湡鐘舵�侊細1 宸茶繃鏈� / 2 鍗冲皢鍒版湡 / 3 姝ｅ父 | + +### 璁￠噺妫�娴嬭褰� + +| 鏂规硶 | 璺緞 | 璇存槑 | 鏉冮檺 | +|------|------|------|------| +| POST | /mes/dv/metering-check/create | 鍒涘缓妫�娴嬭褰� | mes:dv-metering-check:create | +| PUT | /mes/dv/metering-check/update | 鏇存柊妫�娴嬭褰� | mes:dv-metering-check:update | +| DELETE | /mes/dv/metering-check/delete?id= | 鍒犻櫎妫�娴嬭褰� | mes:dv-metering-check:delete | +| GET | /mes/dv/metering-check/get?id= | 鑾峰緱妫�娴嬭褰曡鎯� | mes:dv-metering-check:query | +| GET | /mes/dv/metering-check/page | 妫�娴嬭褰曞垎椤� | mes:dv-metering-check:query | +| GET | /mes/dv/metering-check/export-excel | 瀵煎嚭 Excel | mes:dv-metering-check:export | + +**鍒嗛〉绛涢�夊弬鏁帮紙page 鎺ュ彛锛夛細** + +| 鍙傛暟 | 绫诲瀷 | 蹇呭～ | 璇存槑 | +|------|------|------|------| +| meteringId | Long | 鍚� | 璁￠噺鍣ㄥ叿锛堜粠鍣ㄥ叿鍒楄〃甯﹀叆锛� | +| checkCode | String | 鍚� | 妫�娴嬬紪鍙锋ā绯� | +| checkResult | Integer | 鍚� | 妫�娴嬬粨璁猴紙瀛楀吀锛� | +| checkDate | LocalDate[] | 鍚� | 妫�娴嬫棩鏈熷尯闂� | + +### 鍝嶅簲瀛楁鏂板璇存槑 + +璁￠噺鍣ㄥ叿鍒楄〃/璇︽儏鍝嶅簲棰濆杩斿洖锛� + +| 瀛楁 | 绫诲瀷 | 璇存槑 | +|------|------|------| +| deptName | String | 浣跨敤閮ㄩ棬鍚嶇О | +| chargeUserNickname | String | 璐ｄ换浜烘樀绉� | +| expireStatus | Integer | 鍒版湡鐘舵�侊細1 宸茶繃鏈� / 2 鍗冲皢鍒版湡 / 3 姝ｅ父 | +| expireDays | Long | 璺濆埌鏈熷ぉ鏁帮紙姝ｆ暟鏈埌銆佽礋鏁板凡杩囨湡锛� | + +璁￠噺妫�娴嬭褰曞垪琛�/璇︽儏鍝嶅簲棰濆杩斿洖锛� + +| 瀛楁 | 绫诲瀷 | 璇存槑 | +|------|------|------| +| meteringCode | String | 璁￠噺鍣ㄥ叿缂栫爜 | +| meteringName | String | 璁￠噺鍣ㄥ叿鍚嶇О | +| checkUserNickname | String | 妫�娴嬩汉鏄电О | + +## 瀛楁灞曠ず瑙勫垯 + +| 瀛楁 | 灞曠ず浣嶇疆 | 璇存槑 | +|------|----------|------| +| expireStatus | 璁￠噺鍣ㄥ叿鍒楄〃 | 1 宸茶繃鏈�=鍗遍櫓(danger)锛�2 鍗冲皢鍒版湡=璀﹀憡(warning)锛�3 姝ｅ父=鎴愬姛(success) | +| status | 璁￠噺鍣ㄥ叿鍒楄〃銆佽〃鍗� | 瀛楀吀 mes_dv_metering_status锛堝湪鐢�=success/鍋滅敤=info/鎶ュ簾=danger锛� | +| category | 璁￠噺鍣ㄥ叿鍒楄〃銆佽〃鍗� | 瀛楀吀 mes_dv_metering_category | +| nextCheckDate | 涓や釜椤甸潰 | 璁￠噺鍣ㄥ叿灞曠ず涓恒�屼笅娆℃娴嬫棩鏈熴�嶅垪锛涙娴嬭褰曚繚瀛樻椂鍥炲啓 | +| checkResult | 妫�娴嬭褰曞垪琛ㄣ�佽〃鍗� | 瀛楀吀 mes_dv_metering_check_result锛堝悎鏍�=success/涓嶅悎鏍�=danger锛� | +| meteringCode/meteringName | 妫�娴嬭褰曞垪琛� | 浠庡櫒鍏峰甫鍏ュ睍绀� | +| deptName/chargeUserNickname | 璁￠噺鍣ㄥ叿鍒楄〃 | 閮ㄩ棬銆佽矗浠讳汉鍚嶇О | + +## 涓氬姟瑙勫垯璇存槑 + +| 鍦烘櫙 | 瑙勫垯 | +|------|------| +| 妫�娴嬭褰曟柊澧� | 鏈～ nextCheckDate 鏃舵寜 `checkDate + 鏍″噯鍛ㄦ湡` 鑷姩璁＄畻骞朵繚瀛� | +| 妫�娴嬭褰曟洿鏂� | 閲嶆柊璁＄畻 nextCheckDate锛屽苟鍥炲啓鍣ㄥ叿 | +| 妫�娴嬭褰曞垹闄� | 鍣ㄥ叿鎸夊墿浣欍�屾渶鏂颁竴鏉¤褰曘�嶆暣浣撻噸绠楀洖鍐欙紙鏃犺褰曞垯 lastCheckDate/nextCheckDate 缃┖锛� | +| 璁￠噺鍣ㄥ叿鍒犻櫎 | 宸插叧鑱旀娴嬭褰曟椂鎷掔粷鍒犻櫎锛屾彁绀恒�岃閲忓櫒鍏峰凡鍏宠仈妫�娴嬭褰曪紝鏃犳硶鍒犻櫎銆� | +| 鍒版湡鎻愰啋 | 鍒版湡鍓� N 澶╋紙鍏ㄥ眬閰嶇疆 `mes.dv-metering.remind-days`锛岄粯璁� 30锛夊彂閫佺珯鍐呬俊缁欒矗浠讳汉锛涘悓涓�鍣ㄥ叿鍚屼竴鍒版湡鏃� 60 澶╁唴鍙彁閱掍竴娆� | +| 缂栫爜/缂栧彿鍞竴 | 鍣ㄥ叿 code銆佹娴� checkCode 鍧囧敮涓�锛岄噸澶嶆椂鍚庣鎶ラ敊 | + +## 娉ㄦ剰浜嬮」 + +- expireStatus 鐢卞悗绔绠楀苟杩斿洖锛屽墠绔彧闇�鎸変笁鎬佹覆鏌� tag 棰滆壊锛屾棤闇�鑷璁＄畻澶╂暟銆� +- 鍒犻櫎鍣ㄥ叿鍓嶉渶纭鏃犲叧鑱旀娴嬭褰曪紱鍒犻櫎妫�娴嬭褰曞悗鍣ㄥ叿鐨勫埌鏈熸棩浼氶殢涔嬪彉鍖栵紝鍓嶇搴斿埛鏂板櫒鍏峰垪琛ㄣ�� +- 妫�娴嬭褰曢〉渚濊禆璁￠噺鍣ㄥ叿鏁版嵁锛屽簲鍏堝瓨鍦ㄥ櫒鍏峰啀鐧昏妫�娴嬭褰曘�� +- 鎻愰啋澶╂暟鍙湪銆屽熀纭�璁炬柦 -> 閰嶇疆绠＄悊銆嶄腑淇敼 `mes.dv-metering.remind-days`锛屾敼鍚庣珛鍗崇敓鏁堛�� +- 涓変釜鏂板瓧鍏稿彲鍦ㄣ�岀郴缁熺鐞� -> 瀛楀吀绠＄悊銆嶄腑缁存姢锛歮es_dv_metering_category銆乵es_dv_metering_status銆乵es_dv_metering_check_result銆� -- Gitblit v1.9.3