xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-18 03:16:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

还原date

Browse Source
This commit is contained in:
Turbolisten 2020-09-18 17:41:01 +08:00
parent 68015d3e7f
commit 2a72e341e6
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/BaseEntity.java
View File

@ -29,11 +29,11 @@ public class BaseEntity {
/** /**
* 更新时间 * 更新时间
*/ */
private LocalDateTime updateTime; private Date updateTime;
/** /**
* 创建时间 * 创建时间
*/ */
private LocalDateTime createTime; private Date createTime;
} }

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/log/orderoperatelog/OrderOperateLogService.java
View File

@ -42,7 +42,7 @@ public class OrderOperateLogService {
} }
orderOperateLogEntity.setOperateRemark(e.getOperateRemark()); orderOperateLogEntity.setOperateRemark(e.getOperateRemark());
orderOperateLogEntity.setExtData(e.getExtData()); orderOperateLogEntity.setExtData(e.getExtData());
orderOperateLogEntity.setCreateTime(LocalDateTime.now()); orderOperateLogEntity.setCreateTime(new Date());
orderOperateLogEntity.setOrderType(e.getOrderType().getType()); orderOperateLogEntity.setOrderType(e.getOrderType().getType());
entityList.add(orderOperateLogEntity); entityList.add(orderOperateLogEntity);
}); });

8
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeManage.java
View File

@ -46,8 +46,8 @@ public class NoticeManage {
NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity(); NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity();
recordEntity.setEmployeeId(requestToken.getRequestUserId()); recordEntity.setEmployeeId(requestToken.getRequestUserId());
recordEntity.setNoticeId(entity.getId()); recordEntity.setNoticeId(entity.getId());
recordEntity.setCreateTime(LocalDateTime.now()); recordEntity.setCreateTime(new Date());
recordEntity.setUpdateTime(LocalDateTime.now()); recordEntity.setUpdateTime(new Date());
noticeReceiveRecordDao.insert(recordEntity); noticeReceiveRecordDao.insert(recordEntity);
} }
@ -61,8 +61,8 @@ public class NoticeManage {
NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity(); NoticeReceiveRecordEntity recordEntity = new NoticeReceiveRecordEntity();
recordEntity.setEmployeeId(requestToken.getRequestUserId()); recordEntity.setEmployeeId(requestToken.getRequestUserId());
recordEntity.setNoticeId(noticeId); recordEntity.setNoticeId(noticeId);
recordEntity.setCreateTime(LocalDateTime.now()); recordEntity.setCreateTime(new Date());
recordEntity.setUpdateTime(LocalDateTime.now()); recordEntity.setUpdateTime(new Date());
noticeReceiveRecordDao.insert(recordEntity); noticeReceiveRecordDao.insert(recordEntity);
} }

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/business/notice/NoticeService.java
View File

@ -109,8 +109,8 @@ public class NoticeService {
*/ */
public ResponseDTO<String> add(NoticeAddDTO addDTO, RequestTokenBO requestToken) { public ResponseDTO<String> add(NoticeAddDTO addDTO, RequestTokenBO requestToken) {
NoticeEntity entity = SmartBeanUtil.copy(addDTO, NoticeEntity.class); NoticeEntity entity = SmartBeanUtil.copy(addDTO, NoticeEntity.class);
entity.setCreateTime(LocalDateTime.now()); entity.setCreateTime(new Date());
entity.setUpdateTime(LocalDateTime.now()); entity.setUpdateTime(new Date());
entity.setCreateUser(requestToken.getRequestUserId()); entity.setCreateUser(requestToken.getRequestUserId());
entity.setSendStatus(JudgeEnum.NO.getValue()); entity.setSendStatus(JudgeEnum.NO.getValue());
entity.setDeleted(JudgeEnum.NO.getValue()); entity.setDeleted(JudgeEnum.NO.getValue());

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/file/service/FileService.java
View File

@ -191,7 +191,7 @@ public class FileService {
public ResponseDTO<String> saveFile(FileAddDTO addDTO, RequestTokenBO requestToken) { public ResponseDTO<String> saveFile(FileAddDTO addDTO, RequestTokenBO requestToken) {
FileEntity entity = SmartBeanUtil.copy(addDTO,FileEntity.class); FileEntity entity = SmartBeanUtil.copy(addDTO,FileEntity.class);
entity.setCreaterUser(requestToken.getRequestUserId()); entity.setCreaterUser(requestToken.getRequestUserId());
entity.setCreateTime(LocalDateTime.now()); entity.setCreateTime(new Date());
fileDao.insert(entity); fileDao.insert(entity);
return ResponseDTO.succ(); return ResponseDTO.succ();
} }

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java
View File

@ -54,8 +54,8 @@ public class QuartzTask extends QuartzJobBean {
paramsStr = params.toString(); paramsStr = params.toString();
taskLogEntity.setTaskParams(paramsStr); taskLogEntity.setTaskParams(paramsStr);
} }
taskLogEntity.setUpdateTime(LocalDateTime.now()); taskLogEntity.setUpdateTime(new Date());
taskLogEntity.setCreateTime(LocalDateTime.now()); taskLogEntity.setCreateTime(new Date());
//任务开始时间 //任务开始时间
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
try { try {

6
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTaskService.java
View File

@ -113,8 +113,8 @@ public class QuartzTaskService {
private ResponseDTO<String> saveTask(QuartzTaskDTO quartzTaskDTO) throws Exception { private ResponseDTO<String> saveTask(QuartzTaskDTO quartzTaskDTO) throws Exception {
QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class); QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class);
taskEntity.setTaskStatus(TaskStatusEnum.NORMAL.getStatus()); taskEntity.setTaskStatus(TaskStatusEnum.NORMAL.getStatus());
taskEntity.setUpdateTime(LocalDateTime.now()); taskEntity.setUpdateTime(new Date());
taskEntity.setCreateTime(LocalDateTime.now()); taskEntity.setCreateTime(new Date());
quartzTaskDao.insert(taskEntity); quartzTaskDao.insert(taskEntity);
this.createQuartzTask(scheduler, taskEntity); this.createQuartzTask(scheduler, taskEntity);
return ResponseDTO.succ(); return ResponseDTO.succ();
@ -128,7 +128,7 @@ public class QuartzTaskService {
QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class); QuartzTaskEntity taskEntity = SmartBeanUtil.copy(quartzTaskDTO, QuartzTaskEntity.class);
//任务状态不能更新 //任务状态不能更新
taskEntity.setTaskStatus(updateEntity.getTaskStatus()); taskEntity.setTaskStatus(updateEntity.getTaskStatus());
taskEntity.setUpdateTime(LocalDateTime.now()); taskEntity.setUpdateTime(new Date());
quartzTaskDao.updateById(taskEntity); quartzTaskDao.updateById(taskEntity);
this.updateQuartzTask(scheduler, taskEntity); this.updateQuartzTask(scheduler, taskEntity);
return ResponseDTO.succ(); return ResponseDTO.succ();

4
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeService.java
View File

@ -267,7 +267,7 @@ public class EmployeeService {
updateDTO.setLoginPwd(employeeEntity.getLoginPwd()); updateDTO.setLoginPwd(employeeEntity.getLoginPwd());
} }
EmployeeEntity entity = SmartBeanUtil.copy(updateDTO, EmployeeEntity.class); EmployeeEntity entity = SmartBeanUtil.copy(updateDTO, EmployeeEntity.class);
entity.setUpdateTime(LocalDateTime.now()); entity.setUpdateTime(new Date());
if (StringUtils.isEmpty(entity.getBirthday())) { if (StringUtils.isEmpty(entity.getBirthday())) {
entity.setBirthday(null); entity.setBirthday(null);
} }
@ -281,7 +281,7 @@ public class EmployeeService {
entity.setIsLeave(employeeEntity.getIsLeave()); entity.setIsLeave(employeeEntity.getIsLeave());
entity.setCreateUser(employeeEntity.getCreateUser()); entity.setCreateUser(employeeEntity.getCreateUser());
entity.setCreateTime(employeeEntity.getCreateTime()); entity.setCreateTime(employeeEntity.getCreateTime());
entity.setUpdateTime(LocalDateTime.now()); entity.setUpdateTime(new Date());
employeeDao.updateById(entity); employeeDao.updateById(entity);
employeeCache.remove(employeeId); employeeCache.remove(employeeId);
return ResponseDTO.succ(); return ResponseDTO.succ();