|
@@ -3,7 +3,9 @@ package com.ktg.iscs.service.impl;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
+import com.ktg.common.utils.DateUtils;
|
|
|
import com.ktg.common.utils.SecurityUtils;
|
|
import com.ktg.common.utils.SecurityUtils;
|
|
|
|
|
+import com.ktg.framework.websocket.WebSocketJobTicketLog;
|
|
|
import com.ktg.iscs.domain.IsTicketOperLog;
|
|
import com.ktg.iscs.domain.IsTicketOperLog;
|
|
|
import com.ktg.iscs.mapper.IsTicketOperLogMapper;
|
|
import com.ktg.iscs.mapper.IsTicketOperLogMapper;
|
|
|
import com.ktg.iscs.service.IIsTicketOperLogService;
|
|
import com.ktg.iscs.service.IIsTicketOperLogService;
|
|
@@ -45,8 +47,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("启动作业:" + date + " 作业[" + jobName + "]已启动。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("启动作业:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + " 作业[" + jobName + "]已启动。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -60,8 +63,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(userName);
|
|
isTicketOperLog.setOperationUserName(userName);
|
|
|
- isTicketOperLog.setOperationContent("操作确认:" + date + "[" + userName +"]已确认执行[" + title + "]。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("操作确认:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + userName +"]已确认执行[" + title + "]。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -83,8 +87,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("⼈员变动:" + date + "[" + username +"]已" + type + lockType + "[" +lockUser + "]。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("⼈员变动:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + username +"]已" + type + lockType + "[" +lockUser + "]。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -100,8 +105,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("启动上锁:" + date + "[" + username +"]启动上锁。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("启动上锁:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + username +"]启动上锁。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -117,8 +123,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("完成上锁:" + date + "[" + username +"]完成上锁," + pointNames + "已上锁。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("完成上锁:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + username +"]完成上锁," + pointNames + "已上锁。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -134,8 +141,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("添加共锁:" + date + "[" + colockUser + "]已添加共锁。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("添加共锁:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + colockUser + "]已添加共锁。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -151,8 +159,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("解除共锁:" + date + "[" + colockUser + "]已解除共锁。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("解除共锁:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + colockUser + "]已解除共锁。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -168,8 +177,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("启动解锁:" + date + "[" + username +"]启动解锁。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("启动解锁:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + username +"]启动解锁。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -185,8 +195,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("完成解锁:" + date + "[" + username +"]完成解锁," + pointNames + "已解锁。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("完成解锁:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + username +"]完成解锁," + pointNames + "已解锁。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -202,8 +213,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("取消作业:" + date + "[" + username +"]已取消作业[" + jobName + "]。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("取消作业:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + username +"]已取消作业[" + jobName + "]。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -219,8 +231,9 @@ public class IsTicketOperLogServiceImpl extends ServiceImpl<IsTicketOperLogMappe
|
|
|
isTicketOperLog.setOperationTime(date);
|
|
isTicketOperLog.setOperationTime(date);
|
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
isTicketOperLog.setOperationUserId(userId);
|
|
|
isTicketOperLog.setOperationUserName(username);
|
|
isTicketOperLog.setOperationUserName(username);
|
|
|
- isTicketOperLog.setOperationContent("结束作业:" + date + "[" + username +"]已完成作业[" + jobName + "]。");
|
|
|
|
|
|
|
+ isTicketOperLog.setOperationContent("结束作业:" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date) + "[" + username +"]已完成作业[" + jobName + "]。");
|
|
|
save(isTicketOperLog);
|
|
save(isTicketOperLog);
|
|
|
|
|
+ WebSocketJobTicketLog.sendMessage(String.valueOf(jobId), isTicketOperLog.toString());
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
|