From c6f79f5720c5d4a700b8b759a93393559409fd1c Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期一, 20 五月 2024 15:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 f958545..5b1692d 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
@@ -38,9 +38,6 @@
@Autowired
private IProjectService projectService;
- @Autowired
- private IDeviceService deviceService;
-
private String fileSaveDir = Global.getProfile() + "\\template\\" ;
/**
@@ -73,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);
}
@@ -121,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);
@@ -130,23 +126,14 @@
item.setProjectId(projectId);
item.setProjectName(project.getFullName());
- // 杞崲鍑哄叆搴撶被鍨�
- String proTypeCode = RecordType.getKeyByName(item.getType());
- item.setType(proTypeCode);
-
- // 杞崲璁惧缂栫爜
- String deviceCode = item.getDeviceCode();
- if (!ObjectUtils.isEmpty(deviceCode)){
- Device param = new Device();
- param.setCode(deviceCode);
- List<Device> devices = deviceService.selectDeviceList(param);
- if (!ObjectUtils.isEmpty(devices)){
- Device device = devices.get(0);
- item.setDeviceId(device.getId());
- item.setDeviceCode(device.getCode());
- item.setDeviceName(device.getName());
- }
+ // 杞崲number淇℃伅
+ if (ObjectUtils.isEmpty(number)){
+ number = 1;
+ }else {
+ number++;
}
+ String code = "ZTCJ" + String.format("%06d", number);
+ item.setCode(code);
item.setCreateDate(DateUtils.getNowDate());
insertDeviceLog(item);
@@ -155,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) {
@@ -175,12 +175,12 @@
private List<DeviceLog> readData(String filepath) {
ExcelReader reader = ExcelUtil.getReader(filepath, 0);
- reader.addHeaderAlias("鍑哄叆搴撳崟瀛愬彿", "code");
- reader.addHeaderAlias("璁惧缂栫爜", "deviceCode");
- reader.addHeaderAlias("鍑哄叆搴撶被鍨�", "type");
- reader.addHeaderAlias("鍑哄叆搴撴椂闂�", "transactionDate");
+ reader.addHeaderAlias("璁惧鍚嶇О", "deviceName");
+ reader.addHeaderAlias("绫诲瀷", "type");
+ reader.addHeaderAlias("鍏ュ簱鏃堕棿", "inboundDate");
+ reader.addHeaderAlias("鍑哄簱鏃堕棿", "outboundDate");
reader.addHeaderAlias("缁忓姙浜�", "optUser");
- reader.addHeaderAlias("浣跨敤浜�", "applyUser");
+ reader.addHeaderAlias("璐熻矗浜�", "applyUser");
reader.addHeaderAlias("鍑哄叆搴撴暟閲�", "number");
reader.addHeaderAlias("澶囨敞", "remark");
--
Gitblit v1.9.1