From 983b100e79431dea9a471168dae451d2f7399b76 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 10:16:20 +0800
Subject: [PATCH] 手动设置时间
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 11 +++--
ycl-server/src/main/java/com/ycl/platform/service/impl/NotifyServiceImpl.java | 8 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 6 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java | 6 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java | 7 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java | 8 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 11 +++++
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 11 +++++
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java | 9 ++++
ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java | 8 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 6 ++
11 files changed, 79 insertions(+), 12 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java
index 3c36e50..667556e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateMoneyRuleServiceImpl.java
@@ -8,6 +8,8 @@
import com.ycl.platform.domain.form.CalculateMoneyRuleForm;
import com.ycl.platform.domain.vo.CalculateMoneyRuleVO;
import com.ycl.platform.domain.query.CalculateMoneyRuleQuery;
+
+import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,6 +45,9 @@
@Override
public Result add(CalculateMoneyRuleForm form) {
CalculateMoneyRule entity = CalculateMoneyRuleForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -58,10 +63,12 @@
public Result update(CalculateMoneyRuleForm form) {
CalculateMoneyRule entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
+
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java
index cac5d05..b285a68 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRecordServiceImpl.java
@@ -8,6 +8,8 @@
import com.ycl.platform.domain.form.CalculateRecordForm;
import com.ycl.platform.domain.vo.CalculateRecordVO;
import com.ycl.platform.domain.query.CalculateRecordQuery;
+
+import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,6 +45,9 @@
@Override
public Result add(CalculateRecordForm form) {
CalculateRecord entity = CalculateRecordForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -58,10 +63,11 @@
public Result update(CalculateRecordForm form) {
CalculateRecord entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
index 992dcee..8020953 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateReportServiceImpl.java
@@ -29,6 +29,7 @@
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -54,6 +55,9 @@
@Override
public Result add(CalculateReportForm form) {
CalculateReport entity = CalculateReportForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -69,10 +73,11 @@
public Result update(CalculateReportForm form) {
CalculateReport entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/NotifyServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/NotifyServiceImpl.java
index ac2218a..70a4b83 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/NotifyServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/NotifyServiceImpl.java
@@ -8,6 +8,8 @@
import com.ycl.platform.domain.form.NotifyForm;
import com.ycl.platform.domain.vo.NotifyVO;
import com.ycl.platform.domain.query.NotifyQuery;
+
+import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -46,6 +48,9 @@
@Override
public Result add(NotifyForm form) {
Notify entity = NotifyForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -61,10 +66,11 @@
public Result update(NotifyForm form) {
Notify entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java
index e716c53..a755dc6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/PlatformServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,12 +44,17 @@
public Result add(PlatformForm form) {
Platform entity = PlatformForm.getEntityByForm(form, null);
entity.setParentId(0);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
baseMapper.insert(entity);
if (! CollectionUtils.isEmpty(form.getDeployList())) {
List<Platform> childList = form.getDeployList().stream().map(deploy -> {
Platform child = new Platform();
BeanUtils.copyProperties(deploy, child);
child.setParentId(entity.getId());
+ child.setCreateTime(now);
+ child.setUpdateTime(now);
return child;
}).collect(Collectors.toList());
this.saveBatch(childList);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java
index 045e50c..1b7f65e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java
@@ -11,6 +11,8 @@
import com.ycl.platform.domain.form.RegionForm;
import com.ycl.platform.domain.vo.RegionVO;
import com.ycl.platform.domain.query.RegionQuery;
+
+import java.util.Date;
import java.util.List;
import com.ycl.utils.DateUtils;
@@ -51,6 +53,9 @@
public Result add(RegionForm form) {
Region entity = RegionForm.getEntityByForm(form, null);
entity.setRegionLevel(RegionLevelEnum.STREET);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -66,10 +71,11 @@
public Result update(RegionForm form) {
Region entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 3230e09..8ae4329 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -63,6 +63,9 @@
Report entity = ReportForm.getEntityByForm(form, null);
entity.setStatus(0);
entity.setIdentify(IdUtils.timeAddRandomNO(3));
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -80,7 +83,8 @@
Report entity = baseMapper.selectById(form.getId());
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
-
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (0 == entity.getStatus()) {
// 寰呭鏍哥殑鐩存帴鏀�
BeanUtils.copyProperties(form, entity);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 020946c..b2fbbba 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -105,6 +105,8 @@
errorType = errorType + "," + workOrder.getErrorType();
databaseWorkOrder.setErrorType(errorType);
databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ Date now = new Date();
+ databaseWorkOrder.setUpdateTime(now);
baseMapper.updateById(databaseWorkOrder);
updateNum++;
// 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣 TODO
@@ -153,6 +155,9 @@
workOrderDistributeRecord.setWorkOrderId(item.getId());
workOrderDistributeRecord.setDistributeWay(WorkOrderDistributeWayEnum.DIRECT_DISTRIBUTE);
workOrderDistributeRecord.setUserId(1L);
+ Date now = new Date();
+ workOrderDistributeRecord.setCreateTime(now);
+ workOrderDistributeRecord.setUpdateTime(now);
return workOrderDistributeRecord;
}).collect(Collectors.toList());
workOrderDistributeRecordMapper.insertBatch(distributedRecordList);
@@ -172,6 +177,9 @@
entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -187,10 +195,11 @@
public Result update(WorkOrderForm form) {
WorkOrder entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index 549199d..1fbfae7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -12,6 +12,7 @@
import com.ycl.platform.domain.query.YwPeopleQuery;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -76,6 +77,9 @@
YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
entity.setUserId(sysUser.getUserId());
entity.setAddWay("manual");
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -114,6 +118,8 @@
sysUserMapper.updateUser(sysUser);
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 6a877dc..52af163 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -64,6 +64,9 @@
@Override
public Result add(YwPointForm form) {
YwPoint entity = YwPointForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -77,6 +80,9 @@
.forEach(form -> {
YwPoint entity = YwPointForm.getEntityByForm(form, null);
entity.setStatus("鏈紑濮�");
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
baseMapper.insert(entity);
});
return Result.ok("娣诲姞鎴愬姛");
@@ -89,6 +95,7 @@
new LambdaUpdateChainWrapper<>(baseMapper)
.in(YwPoint::getId, form.getIds())
.set(YwPoint::getUnitId, form.getUnitId())
+ .set(YwPoint::getUpdateTime, new Date())
.update();
} else {
new LambdaUpdateChainWrapper<>(baseMapper)
@@ -96,6 +103,7 @@
.set(YwPoint::getUnitId, form.getUnitId())
.set(YwPoint::getStartTime, null)
.set(YwPoint::getEndTime, null)
+ .set(YwPoint::getUpdateTime, new Date())
.update();
}
return Result.ok("淇敼鎴愬姛");
@@ -111,6 +119,8 @@
YwPoint entity = baseMapper.selectById(form.getId());
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -214,6 +224,7 @@
return new LambdaUpdateChainWrapper<>(baseMapper)
.in(YwPoint::getSerialNumber, serialNumberList)
.set(YwPoint::getRecovery, recovery)
+ .set(YwPoint::getUpdateTime, new Date())
.set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate())
.update();
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index dd9e350..1fc62ca 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -29,10 +29,7 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -59,6 +56,9 @@
@Transactional(rollbackFor = Exception.class)
public Result add(YwUnitForm form) {
YwUnit entity = YwUnitForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
// 鏂板杩愮淮浜哄憳璐﹀彿
SysUser sysUser = new SysUser();
@@ -90,10 +90,11 @@
@Transactional(rollbackFor = Exception.class)
public Result update(YwUnitForm form) {
YwUnit entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
// 淇敼杩愮淮鍗曚綅璐﹀彿淇℃伅
SysUser sysUser = sysUserMapper.selectUserByUserName(entity.getUnitAdminAccount());
--
Gitblit v1.8.0