From 306749fa2e6ea7609468889cb56473770d0a26cc Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期六, 18 五月 2024 14:44:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
index df6206c..d4ae689 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
@@ -70,9 +70,6 @@
*/
@Override
public int insertDeviceLog(DeviceLog deviceLog) {
- if(ObjectUtils.isEmpty(deviceLog.getId())){
- deviceLog.setId(IdGenerate.nextId());
- }
deviceLog.setCreateDate(DateUtils.getNowDate());
return deviceLogMapper.insertDeviceLog(deviceLog);
}
@@ -118,6 +115,8 @@
public String importDeviceLog(String projectId,MultipartFile file, boolean updateSupport) {
// 鍏宠仈椤圭洰淇℃伅
Project project = projectService.selectProjectById(projectId);
+ // 鍏宠仈code
+ Integer number = deviceLogMapper.selectMaxDeviceLogId(projectId);
try {
String dest = saveExcel(file);
@@ -127,6 +126,15 @@
item.setProjectId(projectId);
item.setProjectName(project.getFullName());
+ // 杞崲number淇℃伅
+ if (ObjectUtils.isEmpty(number)){
+ number = 1;
+ }else {
+ number++;
+ }
+ String code = "ZK" + String.format("%06d", number);
+ item.setCode(code);
+
item.setCreateDate(DateUtils.getNowDate());
insertDeviceLog(item);
}
@@ -134,6 +142,19 @@
return e.toString();
}
return "瀵煎叆瀹屾瘯" ;
+ }
+
+
+ /**
+ * 鏌ヨ鏁版嵁搴撲腑id鏈�澶у��
+ * @return
+ *
+ * TRUNCATE TABLE js_device_log;
+ * ALTER TABLE js_device_log AUTO_INCREMENT = 1;
+ */
+ @Override
+ public Integer selectMaxDeviceLogId(String projectId) {
+ return deviceLogMapper.selectMaxDeviceLogId(projectId);
}
private String saveExcel(MultipartFile file) {
@@ -154,7 +175,6 @@
private List<DeviceLog> readData(String filepath) {
ExcelReader reader = ExcelUtil.getReader(filepath, 0);
- reader.addHeaderAlias("鍑哄叆搴撳崟瀛愬彿", "code");
reader.addHeaderAlias("璁惧鍚嶇О", "deviceName");
reader.addHeaderAlias("绫诲瀷", "type");
reader.addHeaderAlias("鍏ュ簱鏃堕棿", "inboundDate");
--
Gitblit v1.9.1