p9ijcxv5q
/
imitsys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fea: 修改时间类型为 字符串，并且批量替换已存在代码

Browse Source
master
谭宗福 2 years ago
parent b00a14b814
commit 6244ff4a62
24 changed files with 131 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
common/src/main/java/com/imitate/common/util/AbstractDO.java
Unescape View File

@ -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;
}

2
parent/pom.xml
Unescape View File

@ -260,6 +260,7 @@
<!--将java包下这两种格式文件让maven在编译过程中携带过去 -->
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.db</include>
</includes>
<filtering>false</filtering>
</resource>
@ -270,6 +271,7 @@
<include>**/*.sh</include>
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.db</include>
</includes>
<filtering>false</filtering>
</resource>

8
web/src/main/java/com/imitate/web/init/Runner.java
Unescape View File

@ -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);

7
web/src/main/java/com/imitate/web/module/simulation/service/ApplicationSystemService.java
Unescape View File

@ -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);
}
}

7
web/src/main/java/com/imitate/web/module/simulation/service/DataCollectService.java
Unescape View File

@ -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);
}
}

7
web/src/main/java/com/imitate/web/module/simulation/service/DataTerminalService.java
Unescape View File

@ -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);
}
}

7
web/src/main/java/com/imitate/web/module/simulation/service/DeviceDataService.java
Unescape View File

@ -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);
}
}

11
web/src/main/java/com/imitate/web/module/simulation/service/DeviceDistributionService.java
Unescape View File

@ -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);
});

7
web/src/main/java/com/imitate/web/module/simulation/service/DeviceHardService.java
Unescape View File

@ -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);
}
}

11
web/src/main/java/com/imitate/web/module/simulation/service/DeviceInitService.java
Unescape View File

@ -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<DeviceInit> 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;

7
web/src/main/java/com/imitate/web/module/simulation/service/DevicePhotoService.java
Unescape View File

@ -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);
}
}

11
web/src/main/java/com/imitate/web/module/simulation/service/DeviceService.java
Unescape View File

@ -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<Device> 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);

11
web/src/main/java/com/imitate/web/module/simulation/service/DeviceTypeService.java
Unescape View File

@ -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);
}
}

7
web/src/main/java/com/imitate/web/module/simulation/service/ManagerSystemService.java
Unescape View File

@ -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);
}
}

11
web/src/main/java/com/imitate/web/module/simulation/service/NetGlqService.java
Unescape View File

@ -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<RemoteFileConfig> 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<RemoteFileConfig> 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;
}

11
web/src/main/java/com/imitate/web/module/simulation/service/ParameterSetService.java
Unescape View File

@ -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);
}
}

7
web/src/main/java/com/imitate/web/module/simulation/service/ProducerService.java
Unescape View File

@ -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);
}
}

18
web/src/main/java/com/imitate/web/module/simulation/service/SecretInitService.java
Unescape View File

@ -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<SecretInit> 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<SecretInit> 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;
}

8
web/src/main/java/com/imitate/web/module/simulation/service/SecretKeyService.java
Unescape View File

@ -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);
}
}

7
web/src/main/java/com/imitate/web/module/simulation/service/UnitAddressService.java
Unescape View File

@ -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);
}
}

2
web/src/main/resources/application.properties
Unescape View File

@ -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

BIN
web/src/main/resources/db/sqlite3.db
View File

Binary file not shown.

BIN
web/src/main/resources/sqlite3
View File

Binary file not shown.

11
web/src/test/java/com/imitate/web/persistence/mapper/DeviceHardMapperTest.java
Unescape View File

@ -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<DeviceHard> 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;

Write Preview
Loading…
Cancel
Save