修改中英文翻译

ktg-admin/src/main/resources/i18n/messages_en_US.properties

@@ -121,9 +121,9 @@ assert.work.order.wait.lock.complete=Wait for lock completion: [{0}]
 assert.work.order.specify=Specify work order!
 assert.work.order.job.id.not.null=Job ID required!
 assert.work.order.device.taken.cannot.operate=Device allocated: Operation blocked
-assert.work.order.not.started.cannot.co.lock=Work order not started: Group lock invalid
-assert.work.order.already.co.locked.cannot.repeat=Group lock active: Duplication prevented
-assert.work.order.not.co.locked.cannot.unlock=No group lock: Unlock aborted
+assert.work.order.not.started.cannot.co.lock=Work order not started: Group Lock invalid
+assert.work.order.already.co.locked.cannot.repeat=Group Lock active: Duplication prevented
+assert.work.order.not.co.locked.cannot.unlock=No Group Lock: Unlock aborted
 assert.work.order.already.unlocked.cannot.repeat=Already unlocked: Operation ignored
 assert.work.order.code.not.null=Work order code required!
 assert.work.order.name.not.null=Work order name required!
@@ -249,7 +249,7 @@ assert.motor.data.not.exist=Motor data missing!
 assert.motor.map.primary.key.not.null=Map primary key required!
 ##\u5730\u56FE\u76F8\u5173
 assert.map.data.parse.fail=Map parsing failed!
-assert.map.provide.loto.cabinet.serial.no=Provide LOTO cabinet serial!
+assert.map.provide.loto.cabinet.serial.no=Provide Lockout cabinet serial!
 ##\u68C0\u67E5\u8BA1\u5212\u76F8\u5173
 assert.inspection.plan.configure.template=Configure inspection template in base data!
 assert.inspection.plan.id.not.null=Plan ID required!
@@ -293,7 +293,7 @@ assert.user.data.duplicate.name.modify=Duplicate names detected: Modify!
 assert.user.not.exist.in.system=User not in system!
 assert.user.work.card.not.bound=Card not linked to user!
 assert.user.employee.card.no.work.task=No tasks assigned!
-assert.user.operate.co.lock.status.not.null=Lock status required!
+assert.user.operate.co.lock.status.not.null=G-Lock status required!
 assert.user.work.card.nfc.not.null=Card NFC required!
 ##\u5B57\u5178\u6570\u636E\u76F8\u5173
 assert.dict.data.key.value.exist=Value exists: {0}!
@@ -303,7 +303,7 @@ assert.business.specify.isolation.point.info=Specify isolation points!
 assert.business.specify.lock.or.unlock=Specify lock/unlock action!
 assert.business.specify.task.status=Specify task status!
 assert.business.point.switch.data.not.null=Switch data required!
-assert.business.loto.serial.no.not.null=LOTO serial required!
+assert.business.loto.serial.no.not.null=Lockout serial required!
 assert.business.point.serial.no.not.null=Point serial required!
 assert.business.nfc.no.lock.info.found=No lock found via NFC!
 assert.business.multiple.faces.recognized.adjust=Multiple faces detected: Re-position!
@@ -335,7 +335,7 @@ assert.business.step.id.not.null=Step ID required!
 assert.business.status.not.null=Status required!
 assert.business.please.execute.previous.step.first=Complete previous step!
 assert.business.please.set.locker.first=Designate locker!
-assert.business.at.least.one.co.locker.required=Minimum one co-locker!
+assert.business.at.least.one.co.locker.required=Minimum one G-Locker required!
 assert.business.work.permit.step.lost.check.data=Step loss detected: Review data!
 assert.business.input.fingerprint.not.null=Fingerprint required!
 assert.business.no.fingerprint.in.database=No prints enrolled!
@@ -441,12 +441,12 @@ assert.loto.switch.map.id.not.null=Switch map ID required!
 assert.res.api.check.id.not.null=Check ID required!
 
 
-\u4EBA\u5458\u7BA1\u7406=Personnel Mgmt
-\u90E8\u95E8\u7BA1\u7406=Dept Mgmt
-\u5C97\u4F4D\u7BA1\u7406=Position Mgmt
-\u5355\u4F4D\u7BA1\u7406=Unit Mgmt
-\u89D2\u8272\u7BA1\u7406=Role Mgmt
-\u786C\u4EF6\u7BA1\u7406=Hardware Mgmt
+\u4EBA\u5458\u7BA1\u7406=Personnel
+\u90E8\u95E8\u7BA1\u7406=Department
+\u5C97\u4F4D\u7BA1\u7406=Position
+\u5355\u4F4D\u7BA1\u7406=Unit
+\u89D2\u8272\u7BA1\u7406=Role
+\u786C\u4EF6\u7BA1\u7406=Hardware
 \u786C\u4EF6\u7C7B\u578B=Hardware Type
 \u9501\u5177\u673A\u6784\u7C7B\u578B=Latch Type
 \u6302\u9501\u7C7B\u578B=Padlock Type
@@ -456,23 +456,23 @@ assert.res.api.check.id.not.null=Check ID required!
 \u94A5\u5319\u4FE1\u606F=Key Info
 \u6302\u9501\u4FE1\u606F=Padlock Info
 RFID\u6807\u8BC6=RFID Tag
-\u9501\u67DC\u7BA1\u7406=Lock Cabinet Mgmt
+\u9501\u67DC\u7BA1\u7406=Cabinet
 \u5DE5\u5361\u4FE1\u606F=Job Card Info
-\u8BBE\u5907\u7BA1\u7406=Equipment Mgmt
+\u8BBE\u5907\u7BA1\u7406=Equipment
 \u8BBE\u5907\u7C7B\u578B\u8BBE\u7F6E=Equipment Type Config
-\u9501\u5B9A\u7AD9\u7BA1\u7406=Lockout Station Mgmt
-\u5F00\u5173\u5E03\u5C40\u7BA1\u7406=Switch Layout Mgmt
-\u5F00\u5173\u7535\u673A\u7BA1\u7406=Switch Motor Mgmt
-\u9694\u79BB\u70B9\u7BA1\u7406=Isolation Point Mgmt
-SOP\u7BA1\u7406=SOP Mgmt
+\u9501\u5B9A\u7AD9\u7BA1\u7406=LOTO Station
+\u5F00\u5173\u5E03\u5C40\u7BA1\u7406=Switch Layout
+\u5F00\u5173\u7535\u673A\u7BA1\u7406=Switch Motor
+\u9694\u79BB\u70B9\u7BA1\u7406=Isolation Point
+SOP\u7BA1\u7406=SOP
 SOP\u5217\u8868=SOP List
-\u4F5C\u4E1A\u7BA1\u7406=Work Order Mgmt
+\u4F5C\u4E1A\u7BA1\u7406=Work Order
 \u4F5C\u4E1A\u6267\u884C=Work Order Execution
 \u4F5C\u4E1A\u5217\u8868=Work Order List
 \u6570\u636E\u7EDF\u8BA1=Data Analytics
 \u57FA\u7840\u6570\u636E\u7EDF\u8BA1=Base Stats
 \u9886\u53D6\u5F52\u8FD8\u7EDF\u8BA1=Pickup/Return Stats
-\u7269\u8D44\u7BA1\u7406=Material Mgmt
+\u7269\u8D44\u7BA1\u7406=Material
 \u7269\u8D44\u67DC=Material Cabinet
 \u7269\u8D44\u7C7B\u578B=Material Type
 \u7269\u8D44\u76D8\u70B9=Material Inventory
@@ -484,18 +484,18 @@ SOP\u5217\u8868=SOP List
 \u7EF4\u4FEE/\u66F4\u6362\u8BB0\u5F55=Maintenance/Replacement Records
 \u7269\u8D44\u67DC\u9ED1\u540D\u5355=Blacklist
 \u7269\u8D44\u4F7F\u7528\u8BF4\u660E=Usage Guide
-\u5F02\u5E38\u7BA1\u7406=Exception Mgmt
+\u5F02\u5E38\u7BA1\u7406=Exception
 \u7269\u8D44\u5F52\u8FD8\u5F02\u5E38=Return Exception
 \u7269\u8D44\u67DC\u95E8\u5F02\u5E38=Cabinet Door Exception
 \u4EBA\u5DE5\u4E0A\u4F20\u5F02\u5E38=Manual Upload Exception
-\u90AE\u4EF6\u7BA1\u7406=Email Mgmt
+\u90AE\u4EF6\u7BA1\u7406=Email
 \u90AE\u4EF6\u6A21\u677F=Templates
 \u90AE\u4EF6\u63D0\u9192=Notifications
-\u7CFB\u7EDF\u7BA1\u7406=System Mgmt
-\u83DC\u5355\u7BA1\u7406=Menu Mgmt
-\u5B57\u5178\u7BA1\u7406=Dictionary Mgmt
+\u7CFB\u7EDF\u7BA1\u7406=System
+\u83DC\u5355\u7BA1\u7406=Menu
+\u5B57\u5178\u7BA1\u7406=Dictionary
 \u901A\u77E5\u516C\u544A=Announcements
-\u65E5\u5FD7\u7BA1\u7406=Log Mgmt
+\u65E5\u5FD7\u7BA1\u7406=Log
 \u64CD\u4F5C\u65E5\u5FD7=Operation Log
 \u767B\u5F55\u65E5\u5FD7=Login Log
 \u7F16\u7801\u89C4\u5219=Auto Code Rules
@@ -505,7 +505,7 @@ SOP\u5217\u8868=SOP List
 \u7CFB\u7EDF\u5DE5\u5177=DevTools
 \u8868\u5355\u6784\u5EFA=Form Builder
 \u4EE3\u7801\u751F\u6210=Code Generator
-\u7CFB\u7EDF\u63A5\u53E3=API Mgmt
+\u7CFB\u7EDF\u63A5\u53E3=API
 
 
 ##\u5B57\u5178\u90E8\u5206
@@ -530,7 +530,7 @@ SOP\u5217\u8868=SOP List
 #pc
 \u8BC6\u522B\u6240\u8981\u5B8C\u6210\u7684\u5DE5\u4F5C\u5185\u5BB9=Identify Work Content
 \u5224\u65AD\u5DE5\u4F5C\u6240\u6D89\u53CA\u7684\u80FD\u91CF\u6E90\u53CA\u9694\u79BB\u65B9\u5F0F=Energy Isolation Method
-\u901A\u77E5\u6240\u6709\u53D7\u5F71\u54CD\u7684\u4EBA=Notify Personnel
+\u901A\u77E5\u6240\u6709\u53D7\u5F71\u54CD\u7684\u4EBA=Notify Affected Employees
 \u5982\u679C\u8BBE\u5907\u6B63\u5728\u8FD0\u884C\uFF0C\u6309\u6B63\u5E38\u64CD\u4F5C\u505C\u673A=Shutdown Operation
 \u4E0A\u9501\u5E76\u6302\u724C=Lockout Tagout
 \u53D6\u9501\u524D\u7684\u68C0\u67E5=Pre-Unlock Check
@@ -538,13 +538,13 @@ SOP\u5217\u8868=SOP List
 
 #android
 \u8BC6\u522B\u5DE5\u4F5C\u5185\u5BB9=Identify Work Content
-\u80FD\u6E90\u9694\u79BB\u65B9\u5F0F=Energy Isolation Method
-\u901A\u77E5\u4EBA\u5458=Notify Personnel
+\u80FD\u91CF\u6E90\u9694\u79BB\u65B9\u5F0F=Energy Isolation Method
+\u901A\u77E5\u4EBA\u5458=Notify Affected Personnel
 \u64CD\u4F5C\u505C\u673A=Shutdown Operation
-\u4E0A\u9501\u6302\u724C=Lockout Tagout
-\u80FD\u91CF\u9694\u79BB\u8BC1\u5B9E=Energy Isolation Verification
+\u4E0A\u9501\u6302\u724C=Lockout
+\u80FD\u91CF\u9694\u79BB\u8BC1\u5B9E=Verify Energy Isolation
 \u53D6\u9501\u524D\u68C0\u67E5=Pre-Unlock Check
-\u62C6\u9501\u6062\u590D\u5F00\u5173=Unlock and Restore Switch
+\u62C6\u9501\u6062\u590D\u5F00\u5173=Remove Lock & Restore Power
 
 #TicketOperLog
 \u542F\u52A8\u4F5C\u4E1A=Start Work Order
@@ -555,21 +555,21 @@ SOP\u5217\u8868=SOP List
 \u5DF2\u786E\u8BA4\u6267\u884C=Confirmed
 
 \u4EBA\u5458\u53D8\u52A8=Personnel Changes
-\u5DF2\u6DFB\u52A0\u4E0A\u9501\u4EBA=Supervisor Added
-\u5DF2\u6DFB\u52A0\u5171\u9501\u4EBA=Co-lock Added
-\u79FB\u9664\u52A0\u4E0A\u9501\u4EBA=Remove Supervisor
-\u79FB\u9664\u52A0\u5171\u9501\u4EBA=Remove Co-lock
+\u5DF2\u6DFB\u52A0\u4E0A\u9501\u4EBA=Locker Added
+\u5DF2\u6DFB\u52A0\u5171\u9501\u4EBA=G-Locker Added
+\u79FB\u9664\u52A0\u4E0A\u9501\u4EBA=Remove Locker
+\u79FB\u9664\u52A0\u5171\u9501\u4EBA=Remove G-Locker
 
 \u542F\u52A8\u4E0A\u9501=Start Lockout
 
 \u5B8C\u6210\u4E0A\u9501=Complete Lockout
 \u5DF2\u4E0A\u9501=Locked
 
-\u5DF2\u6DFB\u52A0\u5171\u9501=Co-lock Added
-\u6DFB\u52A0\u5171\u9501=Add Co-lock
+\u5DF2\u6DFB\u52A0\u5171\u9501=G-Locked
+\u6DFB\u52A0\u5171\u9501=Add Group Lock
 
-\u5DF2\u89E3\u9664\u5171\u9501=Co-lock Released
-\u89E3\u9664\u5171\u9501=Release Co-lock
+\u5DF2\u89E3\u9664\u5171\u9501=G-Unlocked
+\u89E3\u9664\u5171\u9501=Release Group Lock
 
 \u542F\u52A8\u89E3\u9501=Start Release
 

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsTicketOperLogServiceImpl.java

@@ -50,24 +50,24 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
 
 
     private static ArrayList<KeyValueDTO> getLogIn88() {
-        ArrayList<KeyValueDTO> keyValueDTOS = new ArrayList<>();
+        ArrayList keyValueDTOS = new ArrayList<>();
         keyValueDTOS.add(new KeyValueDTO().setKey("启动作业").setValue("Start Work Order"));
         keyValueDTOS.add(new KeyValueDTO().setKey("作业").setValue("Work Order"));
         keyValueDTOS.add(new KeyValueDTO().setKey("已启动").setValue("Initiated"));
         keyValueDTOS.add(new KeyValueDTO().setKey("操作确认").setValue("Confirm"));
         keyValueDTOS.add(new KeyValueDTO().setKey("已确认执行").setValue("Confirmed"));
         keyValueDTOS.add(new KeyValueDTO().setKey("人员变动").setValue("Personnel Changes"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("已添加上锁人").setValue("Supervisor Added"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("已添加共锁人").setValue("Co-lock Added"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("移除加上锁人").setValue("Remove Supervisor"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("移除加共锁人").setValue("Remove Co-lock"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("已添加上锁人").setValue("Locker Added"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("已添加共锁人").setValue("G-Locker Added"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("移除加上锁人").setValue("Remove Locker"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("移除加共锁人").setValue("Remove G-Locker"));
         keyValueDTOS.add(new KeyValueDTO().setKey("启动上锁").setValue("Start Lockout"));
         keyValueDTOS.add(new KeyValueDTO().setKey("完成上锁").setValue("Complete Lockout"));
         keyValueDTOS.add(new KeyValueDTO().setKey("已上锁").setValue("Locked"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("已添加共锁").setValue("Co-lock Added"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("添加共锁").setValue("Add Co-lock"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("已解除共锁").setValue("Co-lock Released"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("解除共锁").setValue("Release Co-lock"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("已添加共锁").setValue("G-Locked"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("添加共锁").setValue("Add Group Lock"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("已解除共锁").setValue("G-Unlocked"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("解除共锁").setValue("Release Group Lock"));
         keyValueDTOS.add(new KeyValueDTO().setKey("启动解锁").setValue("Start Release"));
         keyValueDTOS.add(new KeyValueDTO().setKey("完成解锁").setValue("Complete Release"));
         keyValueDTOS.add(new KeyValueDTO().setKey("已解锁").setValue("Released"));
@@ -76,14 +76,13 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         keyValueDTOS.add(new KeyValueDTO().setKey("已取消作业").setValue("Work Order Cancelled"));
         keyValueDTOS.add(new KeyValueDTO().setKey("取消作业").setValue("Cancel Work Order"));
         keyValueDTOS.add(new KeyValueDTO().setKey("上锁挂牌").setValue("LOTO"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("能量隔离证实").setValue("Energy Isolation Verified"));
-
+        keyValueDTOS.add(new KeyValueDTO().setKey("能量隔离证实").setValue("Verify Energy Isolation"));
         keyValueDTOS.add(new KeyValueDTO().setKey("识别工作内容").setValue("Task Verification"));
         keyValueDTOS.add(new KeyValueDTO().setKey("能量源隔离方式").setValue("Isolation Method"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("通知人员").setValue("Notify Personnel"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("通知人员").setValue("Notify Affected Personnel"));
         keyValueDTOS.add(new KeyValueDTO().setKey("操作停机").setValue("Operation Shutdown"));
         keyValueDTOS.add(new KeyValueDTO().setKey("上锁挂牌").setValue("LOTO"));
-        keyValueDTOS.add(new KeyValueDTO().setKey("能量隔离证实").setValue("Energy Isolation Verified"));
+        keyValueDTOS.add(new KeyValueDTO().setKey("能量隔离证实").setValue("Verify Energy Isolation"));
         keyValueDTOS.add(new KeyValueDTO().setKey("取锁前检查").setValue("Pre-Removal Check"));
         keyValueDTOS.add(new KeyValueDTO().setKey("拆锁恢复开关").setValue("Remove Lock & Restore Power"));
         return keyValueDTOS;