From 6244ff4a62628f02b7a4c3d776e15456791aef06 Mon Sep 17 00:00:00 2001 From: tanzf <1751524287@qq.com> Date: Thu, 7 Dec 2023 09:51:20 +0800 Subject: [PATCH] =?UTF-8?q?fea:=20=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=20=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=89=B9=E9=87=8F=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/imitate/common/util/AbstractDO.java | 4 ++-- parent/pom.xml | 2 ++ .../java/com/imitate/web/init/Runner.java | 8 ++++++-- .../service/ApplicationSystemService.java | 7 +++++-- .../service/DataCollectService.java | 7 +++++-- .../service/DataTerminalService.java | 7 +++++-- .../simulation/service/DeviceDataService.java | 7 +++++-- .../service/DeviceDistributionService.java | 11 +++++++---- .../simulation/service/DeviceHardService.java | 7 +++++-- .../simulation/service/DeviceInitService.java | 11 ++++++++--- .../service/DevicePhotoService.java | 7 +++++-- .../simulation/service/DeviceService.java | 11 ++++++++--- .../simulation/service/DeviceTypeService.java | 11 +++++++---- .../service/ManagerSystemService.java | 7 +++++-- .../simulation/service/NetGlqService.java | 11 +++++++++-- .../service/ParameterSetService.java | 11 +++++++---- .../simulation/service/ProducerService.java | 7 +++++-- .../simulation/service/SecretInitService.java | 18 ++++++++++++------ .../simulation/service/SecretKeyService.java | 8 ++++++-- .../service/UnitAddressService.java | 7 +++++-- web/src/main/resources/application.properties | 2 +- web/src/main/resources/db/sqlite3.db | Bin 0 -> 12288 bytes web/src/main/resources/sqlite3 | Bin 16384 -> 16384 bytes .../mapper/DeviceHardMapperTest.java | 11 +++++++++++ 24 files changed, 131 insertions(+), 51 deletions(-) create mode 100644 web/src/main/resources/db/sqlite3.db diff --git a/common/src/main/java/com/imitate/common/util/AbstractDO.java b/common/src/main/java/com/imitate/common/util/AbstractDO.java index 1626cc0..fb819f7 100644 --- a/common/src/main/java/com/imitate/common/util/AbstractDO.java +++ b/common/src/main/java/com/imitate/common/util/AbstractDO.java @@ -25,7 +25,7 @@ public abstract class AbstractDO implements Serializable{ @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8") - private LocalDateTime createTime; + private String createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8") - private LocalDateTime updateTime; + private String updateTime; } diff --git a/parent/pom.xml b/parent/pom.xml index 0cc429f..2f5250e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -260,6 +260,7 @@ **/*.xml **/*.properties + **/*.db false @@ -270,6 +271,7 @@ **/*.sh **/*.xml **/*.properties + **/*.db false diff --git a/web/src/main/java/com/imitate/web/init/Runner.java b/web/src/main/java/com/imitate/web/init/Runner.java index b50cc69..be9d791 100644 --- a/web/src/main/java/com/imitate/web/init/Runner.java +++ b/web/src/main/java/com/imitate/web/init/Runner.java @@ -17,6 +17,7 @@ import org.w3c.dom.Element; import javax.annotation.PostConstruct; import java.io.File; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -41,6 +42,9 @@ public class Runner{ @PostConstruct public void init(){ + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); log.info("-------init db from excel or xml--------"); File file = new File(initPath+ File.separator +initExcelName); if (!file.exists()){ @@ -65,7 +69,7 @@ public class Runner{ producer.setContacts1(producerElement.getAttribute("contacts1")); producer.setTel1(producerElement.getAttribute("tel1")); producer.setPhone1(producerElement.getAttribute("phone1")); - producer.setCreateTime(LocalDateTime.now()); + producer.setCreateTime(nowAsString); producerList.add(producer); } producerMapper.insertList(producerList); @@ -80,7 +84,7 @@ public class Runner{ deviceType.setPattern(deviceTypeElement.getAttribute("pattern")); deviceType.setSecretLevel(deviceTypeElement.getAttribute("secretLevel")); deviceType.setManagementLevel(deviceTypeElement.getAttribute("managementLevel")); - deviceType.setCreateTime(LocalDateTime.now()); + deviceType.setCreateTime(nowAsString); deviceTypeList.add(deviceType); } deviceTypeMapper.insertList(deviceTypeList); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/ApplicationSystemService.java b/web/src/main/java/com/imitate/web/module/simulation/service/ApplicationSystemService.java index 1e7c928..a025944 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/ApplicationSystemService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/ApplicationSystemService.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import tk.mybatis.mapper.entity.Example; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -41,6 +42,8 @@ public class ApplicationSystemService { public int updateOrAdd(ApplicationSystem applicationSystem) { LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); Example example = new Example(ApplicationSystem.class); example.createCriteria().andEqualTo("systemName",applicationSystem.getSystemName()); ApplicationSystem oneByExample = applicationSystemMapper.selectOneByExample(example); @@ -49,13 +52,13 @@ public class ApplicationSystemService { if (null!=oneByExample){ return -1; } - applicationSystem.setCreateTime(now); + applicationSystem.setCreateTime(nowAsString); return applicationSystemMapper.insertSelective(applicationSystem); }else { if (null!=oneByExample && !applicationSystem.getId().equals(oneByExample.getId())){ return -1; } - applicationSystem.setUpdateTime(now); + applicationSystem.setUpdateTime(nowAsString); return applicationSystemMapper.updateByPrimaryKeySelective(applicationSystem); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DataCollectService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DataCollectService.java index a79906e..c9b5013 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DataCollectService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DataCollectService.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.stream.Collectors; @@ -26,11 +27,13 @@ public class DataCollectService { public int updateOrAdd(DataCollect dataCollect) { LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (null == dataCollect.getId()){ - dataCollect.setCreateTime(now); + dataCollect.setCreateTime(nowAsString); return dataCollectMapper.insert(dataCollect); }else { - dataCollect.setUpdateTime(now); + dataCollect.setUpdateTime(nowAsString); return dataCollectMapper.updateByPrimaryKeySelective(dataCollect); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DataTerminalService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DataTerminalService.java index 9d87376..65dd0b3 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DataTerminalService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DataTerminalService.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -36,14 +37,16 @@ public class DataTerminalService { public int updateOrAdd(DataTerminal dataTerminal){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (null == dataTerminal.getId()){ if(StringUtils.isEmpty(dataTerminal.getName())){ dataTerminal.setName("终端/服务器"+ DateUtil.format(now,"yyyyMMddHHmmss")); } - dataTerminal.setCreateTime(now); + dataTerminal.setCreateTime(nowAsString); return dataTerminalMapper.insertSelective(dataTerminal); }else { - dataTerminal.setUpdateTime(now); + dataTerminal.setUpdateTime(nowAsString); return dataTerminalMapper.updateByPrimaryKeySelective(dataTerminal); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDataService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDataService.java index 527b27b..055ad90 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDataService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDataService.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -27,11 +28,13 @@ public class DeviceDataService { public int updateOrAdd(DeviceData deviceData) { LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (null == deviceData.getId()){ - deviceData.setCreateTime(now); + deviceData.setCreateTime(nowAsString); return deviceDataMapper.insertSelective(deviceData); }else { - deviceData.setUpdateTime(now); + deviceData.setUpdateTime(nowAsString); return deviceDataMapper.updateByPrimaryKeySelective(deviceData); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDistributionService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDistributionService.java index 5f1c519..ba54492 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDistributionService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceDistributionService.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -44,10 +45,12 @@ public class DeviceDistributionService { @Transactional(rollbackFor = Exception.class) public int editOrAdd(DistributionParam param){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); int lc; if (null == param.getId()){ param.setBeginTime(now); - param.setCreateTime(now); + param.setCreateTime(nowAsString); param.setEndTime(now.plusDays(30*3)); param.setStatus("1"); param.setNumber("CK"+ DateUtil.format(now,"yyyyMMddHHmmss")); @@ -55,16 +58,16 @@ public class DeviceDistributionService { param.setDeviceCount(param.getDeviceList().size()); param.getDeviceList().forEach(e->{ - e.setUpdateTime(now); + e.setUpdateTime(nowAsString); e.setDistributionId(param.getId()); deviceMapper.updateByPrimaryKeySelective(e); }); }else { - param.setUpdateTime(now); + param.setUpdateTime(nowAsString); lc = deviceDistributionMapper.updateByPrimaryKeySelective(param.getDeviceDistribution()); deviceMapper.updateDistributionId(param.getId()); param.getDeviceList().forEach(e->{ - e.setUpdateTime(now); + e.setUpdateTime(nowAsString); e.setDistributionId(param.getId()); deviceMapper.updateByPrimaryKeySelective(e); }); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java index 221b800..31832be 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java @@ -15,6 +15,7 @@ import tk.mybatis.mapper.entity.Example; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.Optional; @@ -33,6 +34,8 @@ public class DeviceHardService { public int updateOrAdd(DeviceHard deviceHard) { LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); Example example = new Example(DeviceHard.class); example.createCriteria().andEqualTo("deviceNumber",deviceHard.getDeviceNumber()); @@ -45,13 +48,13 @@ public class DeviceHardService { if(StringUtils.isEmpty(deviceHard.getDeviceName())){ deviceHard.setDeviceName("设备"+ DateUtil.format(now,"yyyyMMddHHmmss")); } - deviceHard.setCreateTime(now); + deviceHard.setCreateTime(nowAsString); return deviceHardMapper.insertSelective(deviceHard); }else { if (null!=oneByExample && !deviceHard.getId().equals(oneByExample.getId())){ return -1; } - deviceHard.setUpdateTime(now); + deviceHard.setUpdateTime(nowAsString); return deviceHardMapper.updateByPrimaryKeySelective(deviceHard); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceInitService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceInitService.java index 83dde42..b1e3fb5 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceInitService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceInitService.java @@ -1,6 +1,7 @@ package com.imitate.web.module.simulation.service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +27,8 @@ public class DeviceInitService { //根据导入不同胡压缩包 最终生产对应内容 DeviceInit deviceInit = new DeviceInit(); LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); deviceInit.setSecret("aGVsbG93b3JsZAo="); deviceInit.setAlgorithm("Y2Fuc2h1Cg=="); deviceInit.setSelfInspectionCode("emlqaWFubWEK");; @@ -36,8 +39,8 @@ public class DeviceInitService { deviceInit.setFirmwareVersion("v2"); deviceInit.setDeviceStatus("已开机"); deviceInit.setDeviceName(fileName); - deviceInit.setCreateTime(now); - deviceInit.setUpdateTime(now); + deviceInit.setCreateTime(nowAsString); + deviceInit.setUpdateTime(nowAsString); deviceInitMapper.selectCount(deviceInit); @@ -61,9 +64,11 @@ public class DeviceInitService { List list = deviceInitMapper.selectAll(); if(list.size() > 0){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); DeviceInit deviceInit = list.get(0); deviceInit.setDataInstalled("已安装"); - deviceInit.setUpdateTime(now); + deviceInit.setUpdateTime(nowAsString); return deviceInitMapper.updateByPrimaryKeySelective(deviceInit); } return 0; diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DevicePhotoService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DevicePhotoService.java index 042e29f..c6b7b69 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DevicePhotoService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DevicePhotoService.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -34,11 +35,13 @@ public class DevicePhotoService { public int updateOrAdd(DevicePhoto devicePhoto) { LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (null == devicePhoto.getId()){ - devicePhoto.setCreateTime(now); + devicePhoto.setCreateTime(nowAsString); return devicePhotoMapper.insert(devicePhoto); }else { - devicePhoto.setUpdateTime(now); + devicePhoto.setUpdateTime(nowAsString); return devicePhotoMapper.updateByPrimaryKeySelective(devicePhoto); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceService.java index 9959118..c4b2d04 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceService.java @@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import tk.mybatis.mapper.entity.Example; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -51,6 +52,8 @@ public class DeviceService{ public int updateOrAddDevice(Device device){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); Example example = new Example(Device.class); example.createCriteria().andEqualTo("deviceId",device.getDeviceId()); @@ -64,13 +67,13 @@ public class DeviceService{ device.setName("设备"+ DateUtil.format(now,"yyyyMMddHHmmss")); } device.setAddTime(now); - device.setCreateTime(now); + device.setCreateTime(nowAsString); return deviceMapper.insertSelective(device); }else { if (null!=oneByExample && !device.getId().equals(oneByExample.getId())){ return -1; } - device.setUpdateTime(now); + device.setUpdateTime(nowAsString); return deviceMapper.updateByPrimaryKeySelective(device); } } @@ -125,6 +128,8 @@ public class DeviceService{ .collect(Collectors.toMap(DeviceType::getName, DeviceType::getId, (key1, key2) -> key2)); //复制参数 LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); List deviceList = new ArrayList<>(); for (DeviceVO vo : deviceVOList) { //判断是否已存在编号 @@ -136,7 +141,7 @@ public class DeviceService{ Device device = new Device(); BeanUtils.copyProperties(vo,device); device.setAddTime(now); - device.setCreateTime(now); + device.setCreateTime(nowAsString); device.setType(typeMaps.getOrDefault(vo.getTypeName(),0L)); device.setProducerId(producerMaps.getOrDefault(vo.getProducerName(),0L)); deviceList.add(device); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceTypeService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceTypeService.java index c1532c4..f627a24 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DeviceTypeService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DeviceTypeService.java @@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional; import tk.mybatis.mapper.entity.Example; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -56,6 +57,8 @@ public class DeviceTypeService { @Transactional(rollbackFor = Exception.class) public int updateOrAddProducer(DeviceTypeParam deviceTypeParam){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); DeviceType deviceType = new DeviceType(); BeanUtils.copyProperties(deviceTypeParam,deviceType); @@ -70,7 +73,7 @@ public class DeviceTypeService { return -1; } //新增设备类型 - deviceType.setCreateTime(now); + deviceType.setCreateTime(nowAsString); int i = deviceTypeMapper.insertSelective(deviceType); if (null == deviceTypeParam.getProducerIdList() || i<0){ return i; @@ -80,7 +83,7 @@ public class DeviceTypeService { DeviceTypeProducer deviceTypeProducer = new DeviceTypeProducer(); deviceTypeProducer.setTypeId(deviceType.getId()); deviceTypeProducer.setProducerId(pid); - deviceTypeProducer.setCreateTime(now); + deviceTypeProducer.setCreateTime(nowAsString); typeProducerList.add(deviceTypeProducer); }); typeProducerMapper.insertList(typeProducerList); @@ -97,13 +100,13 @@ public class DeviceTypeService { DeviceTypeProducer deviceTypeProducer = new DeviceTypeProducer(); deviceTypeProducer.setTypeId(deviceType.getId()); deviceTypeProducer.setProducerId(pid); - deviceTypeProducer.setCreateTime(now); + deviceTypeProducer.setCreateTime(nowAsString); typeProducerList.add(deviceTypeProducer); }); typeProducerMapper.insertList(typeProducerList); } - deviceType.setUpdateTime(now); + deviceType.setUpdateTime(nowAsString); return deviceTypeMapper.updateByPrimaryKeySelective(deviceType); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/ManagerSystemService.java b/web/src/main/java/com/imitate/web/module/simulation/service/ManagerSystemService.java index bf00af0..d91ba5a 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/ManagerSystemService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/ManagerSystemService.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -24,11 +25,13 @@ public class ManagerSystemService { public int updateOrAdd(ManagerSystem managerSystem){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (null == managerSystem.getId()){ - managerSystem.setCreateTime(now); + managerSystem.setCreateTime(nowAsString); return managerSystemMapper.insertSelective(managerSystem); }else { - managerSystem.setUpdateTime(now); + managerSystem.setUpdateTime(nowAsString); return managerSystemMapper.updateByPrimaryKeySelective(managerSystem); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/NetGlqService.java b/web/src/main/java/com/imitate/web/module/simulation/service/NetGlqService.java index e4400a0..a6fa418 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/NetGlqService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/NetGlqService.java @@ -1,6 +1,7 @@ package com.imitate.web.module.simulation.service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,6 +63,9 @@ public class NetGlqService { * @param jsonStr */ public void sendData(Integer type, String jsonStr) { + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); List list = remoteFileConfigMapper.selectAll(); RemoteFileConfig remoteFileConfig = new RemoteFileConfig(); if(list.size() > 0){ @@ -92,7 +96,7 @@ public class NetGlqService { remoteFileConfig.setVpnStrategy(jsonStr); break; default: - remoteFileConfig.setUpdateTime(LocalDateTime.now()); + remoteFileConfig.setUpdateTime(nowAsString); remoteFileConfigMapper.updateByPrimaryKeySelective(remoteFileConfig); break; } @@ -104,6 +108,9 @@ public class NetGlqService { * @param type */ public void cleanRemoteConfig(Integer type) { + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); List list = remoteFileConfigMapper.selectAll(); RemoteFileConfig remoteFileConfig = new RemoteFileConfig(); if(list.size() > 0){ @@ -130,7 +137,7 @@ public class NetGlqService { remoteFileConfig.setVpnStrategy(null); break; default: - remoteFileConfig.setUpdateTime(LocalDateTime.now()); + remoteFileConfig.setUpdateTime(nowAsString); remoteFileConfigMapper.updateByPrimaryKeySelective(remoteFileConfig); break; } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/ParameterSetService.java b/web/src/main/java/com/imitate/web/module/simulation/service/ParameterSetService.java index d5831a8..1be483f 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/ParameterSetService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/ParameterSetService.java @@ -1,6 +1,7 @@ package com.imitate.web.module.simulation.service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,16 +22,18 @@ public class ParameterSetService { - public ParameterSet updateOrAdd(ParameterSet parameterSet){ + public int updateOrAdd(ParameterSet parameterSet){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (null == parameterSet.getId()){ if(StringUtils.isEmpty(parameterSet.getIpAddress())){ parameterSet.setIpAddress("114.114.114.114"); } - parameterSet.setCreateTime(now); - return parameterSetMapper.insertSelective(dataTerminal); + parameterSet.setCreateTime(nowAsString); + return parameterSetMapper.insertSelective(parameterSet); }else { - parameterSet.setUpdateTime(now); + parameterSet.setUpdateTime(nowAsString); return parameterSetMapper.updateByPrimaryKeySelective(parameterSet); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/ProducerService.java b/web/src/main/java/com/imitate/web/module/simulation/service/ProducerService.java index 3653eeb..68ea7d8 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/ProducerService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/ProducerService.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -33,11 +34,13 @@ public class ProducerService { public int updateOrAddProducer(Producer producer){ LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (producer.getId() == null){ - producer.setCreateTime(now); + producer.setCreateTime(nowAsString); return producerMapper.insertSelective(producer); }else { - producer.setUpdateTime(now); + producer.setUpdateTime(nowAsString); return producerMapper.updateByPrimaryKey(producer); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/SecretInitService.java b/web/src/main/java/com/imitate/web/module/simulation/service/SecretInitService.java index d013f6c..a991cc6 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/SecretInitService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/SecretInitService.java @@ -1,6 +1,7 @@ package com.imitate.web.module.simulation.service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +35,8 @@ public class SecretInitService { // 根据加载不同的文件 生成密码机初装数据 SecretInit secretInit = new SecretInit(); LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); secretInit.setPasswordInit("aGVsbG93b3JsZAo="); secretInit.setAlgorithmParam("Y2Fuc2h1Cg=="); secretInit.setParamCode("emlqaWFubWEK"); @@ -41,8 +44,8 @@ public class SecretInitService { secretInit.setSecretRain("未销毁"); secretInit.setSecretKill("未遥毙"); secretInit.setMmjKill("未遥毙"); - secretInit.setCreateTime(now); - secretInit.setUpdateTime(now); + secretInit.setCreateTime(nowAsString); + secretInit.setUpdateTime(nowAsString); secretInitMapper.selectCount(secretInit); @@ -51,9 +54,9 @@ public class SecretInitService { List list = secretInitMapper.selectByExample(example); if(list.size() > 0){ secretInit.setId(list.get(0).getId()); - secretInitMapper.updateByPrimaryKeySelective(deviceInit); + secretInitMapper.updateByPrimaryKeySelective(secretInit); }else{ - secretInitMapper.insertSelective(deviceInit); + secretInitMapper.insertSelective(secretInit); } return secretInit; } @@ -63,13 +66,16 @@ public class SecretInitService { * 发送数据 */ public void sendData(){ + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); Example example = new Example(SecretInit.class); example.createCriteria().andEqualTo("fileName",fileName); List list = secretInitMapper.selectByExample(example); if(list.size() > 0){ SecretInit secretInit = list.get(0); secretInit.setSecretDataStatus("已发送"); - secretInit.setUpdateTime(LocalDateTime.now()); + secretInit.setUpdateTime(nowAsString); secretInitMapper.updateByPrimaryKeySelective(secretInit); } } @@ -97,7 +103,7 @@ public class SecretInitService { secretInit.setSecretKill("已遥毙"); break; case 3: - secretInit.setMmjKill("已遥毙") + secretInit.setMmjKill("已遥毙"); default: break; } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/SecretKeyService.java b/web/src/main/java/com/imitate/web/module/simulation/service/SecretKeyService.java index f07cb21..8025458 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/SecretKeyService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/SecretKeyService.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -56,6 +57,9 @@ public class SecretKeyService{ } public int addEncryptionKeyList(SecretKey secretKey,String inType){ + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); int lc = -1; if (!inType.equals(secretKey.getType())){ return -2; @@ -68,7 +72,7 @@ public class SecretKeyService{ secretKey.setLength(null); lc = secretKeyMapper.updateByAlgorithmAndType(secretKey); if (lc<=0){ - secretKey.setCreateTime(LocalDateTime.now()); + secretKey.setCreateTime(nowAsString); lc = secretKeyMapper.insertSelective(secretKey); } }else { @@ -79,7 +83,7 @@ public class SecretKeyService{ secretKey.setAlgorithm(null); lc = secretKeyMapper.updateByLengthAndType(secretKey); if (lc<=0){ - secretKey.setCreateTime(LocalDateTime.now()); + secretKey.setCreateTime(nowAsString); lc = secretKeyMapper.insertSelective(secretKey); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/UnitAddressService.java b/web/src/main/java/com/imitate/web/module/simulation/service/UnitAddressService.java index 4f8c2ee..89c769e 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/UnitAddressService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/UnitAddressService.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -24,11 +25,13 @@ public class UnitAddressService { public int updateOrAdd(UnitAddress unitAddress) { LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); if (null == unitAddress.getId()){ - unitAddress.setCreateTime(now); + unitAddress.setCreateTime(nowAsString); return unitAddressMapper.insert(unitAddress); }else{ - unitAddress.setUpdateTime(now); + unitAddress.setUpdateTime(nowAsString); return unitAddressMapper.updateByPrimaryKeySelective(unitAddress); } } diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties index 2b896fa..3dbd21e 100644 --- a/web/src/main/resources/application.properties +++ b/web/src/main/resources/application.properties @@ -31,7 +31,7 @@ mybatis.configuration.map-underscore-to-camel-case=true # SQLite spring.datasource.driver-class-name=org.sqlite.JDBC -spring.datasource.url=jdbc:sqlite:D:/projectCode/imitsys/web/src/main/resources/sqlite3 +spring.datasource.url=jdbc:sqlite::resource:db/sqlite3.db #xgd init imitate.init.path=/data/workspace/platform/eva/datacenter diff --git a/web/src/main/resources/db/sqlite3.db b/web/src/main/resources/db/sqlite3.db new file mode 100644 index 0000000000000000000000000000000000000000..d6b9820faf8ced24ad9a11d8ff2ff4437c061149 GIT binary patch literal 12288 zcmeI&!E(|-7zgkTI7&N3obk{ecLonIZ5<%Bc6u^mR7OBdgCnP%G%S)KY#>>1`T~0K zfxP%2zC|Cw#S#jY(DA0@e}{x@zHh%>e%VWAID1$3B&WR~96FNf0`kwV~Ybo+re9Nk=)Xo>O^Fy7`AOHafKmY;|fB*y_0D=Eqpq0A2yT7k> zq;u}`XzZ(Z5*G3CgbVj(H(j+%!#1gHJg=MdMs7hkLw=w}7C%4I?(OFD+SlB#nq5Bi zT+aGV*j>6zt<+iy&_Z^bs^)cRt!bODOpCUxTEnn9^o`k}M%#W{YpTHwvuPh(rTToz z{YCZ*^QFm?wI{B3`bX#AM!R zarfF$a-Wa-fmr7haVOD#wh+azsQ9E@iRV$}WWXk&zX)DWr-ljE^PP{sJ@nH2!Mcvx zzWyyap;{Sd(o{`P-vyDb8-bthGpAG0HE+M;JoV}ZCx$i`M z&>#Q-2tWV=5P$##AOHafKmY;|_!|WbZI5h`hpS7=WOO|<9*--fihfwG9G0HaQu$Or yJ}v2MZe6|qUy|JAY8CV#009U<00Izz00bZa0SG_<0ucCj1@3F<{MOPRU48;WQxvQK literal 0 HcmV?d00001 diff --git a/web/src/main/resources/sqlite3 b/web/src/main/resources/sqlite3 index 301b20adef8d5dff3efe634b5847e34c9ecaf973..922dbf510c40cb601a4d1d7b00e36e951ed45de3 100644 GIT binary patch delta 149 zcmZo@U~Fh$oFL7}K2gS*m7PIP;>5<3Me=Mn82DfE-`FguaDsng0E-|$6SFd7N@`hV za%y}=Vo?h7Vy(0jB1|)g_ delta 75 zcmV-R0JQ&rfB}Gj0gxL31(6&>1qA>uZn&{zq8|p?01xR8*|QNK#}AQE1`rMc10xA! hWp-&}WnXAva%7X~FB=8{55E8pzq1h#wGWfOKS61-7svnr diff --git a/web/src/test/java/com/imitate/web/persistence/mapper/DeviceHardMapperTest.java b/web/src/test/java/com/imitate/web/persistence/mapper/DeviceHardMapperTest.java index 8e70f00..deb0d2d 100644 --- a/web/src/test/java/com/imitate/web/persistence/mapper/DeviceHardMapperTest.java +++ b/web/src/test/java/com/imitate/web/persistence/mapper/DeviceHardMapperTest.java @@ -8,6 +8,7 @@ import org.springframework.boot.test.context.SpringBootTest; import javax.annotation.Resource; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -25,6 +26,16 @@ class DeviceHardMapperTest { List select = deviceHardMapper.select(deviceHard); } + @Test + public void insert(){ + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); + DeviceHard deviceHard = new DeviceHard(); + deviceHard.setCreateTime(nowAsString); + deviceHardMapper.insert(deviceHard); + } + class dh{ @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8") private String createTime;