修改日志的标识

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

@@ -519,9 +519,13 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                 List<String> nfcList = lockList.stream().map(LockPointBatchDTO::getPointNfc).collect(Collectors.toList());
                 List<IsIsolationPoint> list1 = iIsIsolationPointService.list(Wrappers.<IsIsolationPoint>lambdaQuery()
                         .in(IsIsolationPoint::getPointNfc, nfcList));
-                String pointNames = list1.stream().map(IsIsolationPoint::getPointName).collect(Collectors.joining(","));
+                // String pointNames = list1.stream().map(IsIsolationPoint::getPointName).collect(Collectors.joining(","));
+                StringBuilder pointNames = new StringBuilder();
+                for (IsIsolationPoint isIsolationPoint : list1) {
+                    pointNames.append("<").append(isIsolationPoint.getPointIcon()).append(">").append("[").append(isIsolationPoint.getPointName()).append("] ");
+                }
                 // 完成上锁
-                isTicketOperLogService.addLog5(byId.getTicketId(), byId.getTicketName(), pointNames);
+                isTicketOperLogService.addLog5(byId.getTicketId(), byId.getTicketName(), pointNames.toString());
             }
         }
         List<LockPointBatchDTO> unlockList = list.stream().filter(o -> o.getTarget().equals(1)).collect(Collectors.toList());
@@ -531,9 +535,13 @@ public class HardwareApiServiceImpl implements HardwareApiService {
                 List<String> nfcList = unlockList.stream().map(LockPointBatchDTO::getPointNfc).collect(Collectors.toList());
                 List<IsIsolationPoint> list1 = iIsIsolationPointService.list(Wrappers.<IsIsolationPoint>lambdaQuery()
                         .in(IsIsolationPoint::getPointNfc, nfcList));
-                String pointNames = list1.stream().map(IsIsolationPoint::getPointName).collect(Collectors.joining(","));
+                // String pointNames = list1.stream().map(IsIsolationPoint::getPointName).collect(Collectors.joining(","));
+                StringBuilder pointNames = new StringBuilder();
+                for (IsIsolationPoint isIsolationPoint : list1) {
+                    pointNames.append("<").append(isIsolationPoint.getPointIcon()).append(">").append("[").append(isIsolationPoint.getPointName()).append("] ");
+                }
                 // 完成解锁
-                isTicketOperLogService.addLog9(byId.getTicketId(), byId.getTicketName(), pointNames);
+                isTicketOperLogService.addLog9(byId.getTicketId(), byId.getTicketName(), String.valueOf(pointNames));
             }
         }
     }

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

@@ -45,7 +45,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("启动作业：" + date + " 作业" +  jobName + "已启动。");
+        isTicketOperLog.setOperationContent("启动作业：" + date + " 作业[" +  jobName + "]已启动。");
         save(isTicketOperLog);
         return true;
     }
@@ -60,7 +60,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(userName);
-        isTicketOperLog.setOperationContent("操作确认：" + date + userName +"已确认执行" +  title + "。");
+        isTicketOperLog.setOperationContent("操作确认：" + date + "[" + userName +"]已确认执行[" +  title + "]。");
         save(isTicketOperLog);
         return true;
     }
@@ -83,7 +83,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("⼈员变动：" + date + username +"已" + type + lockType +  lockUser + "。");
+        isTicketOperLog.setOperationContent("⼈员变动：" + date + "[" + username +"]已" + type + lockType + "[" +lockUser + "]。");
         save(isTicketOperLog);
         return true;
     }
@@ -100,7 +100,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("启动上锁：" + date + username +"启动上锁。");
+        isTicketOperLog.setOperationContent("启动上锁：" + date + "[" + username +"]启动上锁。");
         save(isTicketOperLog);
         return true;
     }
@@ -117,7 +117,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("完成上锁：" + date + username +"完成上锁，" + pointNames + "已上锁。");
+        isTicketOperLog.setOperationContent("完成上锁：" + date + "[" + username +"]完成上锁，" + pointNames + "已上锁。");
         save(isTicketOperLog);
         return true;
     }
@@ -134,7 +134,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("添加共锁：" + date + colockUser + "已添加共锁。");
+        isTicketOperLog.setOperationContent("添加共锁：" + date + "[" + colockUser + "]已添加共锁。");
         save(isTicketOperLog);
         return true;
     }
@@ -151,7 +151,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("解除共锁：" + date + colockUser + "已解除共锁。");
+        isTicketOperLog.setOperationContent("解除共锁：" + date + "[" + colockUser + "]已解除共锁。");
         save(isTicketOperLog);
         return true;
     }
@@ -168,7 +168,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("启动解锁：" + date + username +"启动解锁。");
+        isTicketOperLog.setOperationContent("启动解锁：" + date + "[" + username +"]启动解锁。");
         save(isTicketOperLog);
         return true;
     }
@@ -185,7 +185,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("完成解锁：" + date + username +"完成解锁，" + pointNames + "已解锁。");
+        isTicketOperLog.setOperationContent("完成解锁：" + date + "[" + username +"]完成解锁，" + pointNames + "已解锁。");
         save(isTicketOperLog);
         return true;
     }
@@ -202,7 +202,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("取消作业：" + date + username +"已取消作业" + jobName + "。");
+        isTicketOperLog.setOperationContent("取消作业：" + date + "[" + username +"]已取消作业[" + jobName + "]。");
         save(isTicketOperLog);
         return true;
     }
@@ -219,7 +219,7 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
         isTicketOperLog.setOperationTime(date);
         isTicketOperLog.setOperationUserId(userId);
         isTicketOperLog.setOperationUserName(username);
-        isTicketOperLog.setOperationContent("结束作业：" + date + username +"已完成作业" + jobName + "。");
+        isTicketOperLog.setOperationContent("结束作业：" + date + "[" + username +"]已完成作业[" + jobName + "]。");
         save(isTicketOperLog);
         return true;
     }