diff --git a/parent/pom.xml b/parent/pom.xml index 5e1772d..ab2fc41 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -16,7 +16,6 @@ pom - 1.8 1.2.83 @@ -44,7 +43,7 @@ - + org.springframework.boot spring-boot-starter @@ -61,7 +60,6 @@ spring-boot-starter-aop - org.springframework.boot @@ -143,7 +141,7 @@ org.xerial sqlite-jdbc - 3.21.0.1 + 3.36.0.1 @@ -161,13 +159,12 @@ - commons-fileupload commons-fileupload 1.3.2 - + org.apache.commons commons-lang3 @@ -198,17 +195,9 @@ - - - - - - - - @@ -278,14 +267,9 @@ - imitate-${project.version} - - - - diff --git a/web/src/main/java/com/imitate/web/WebApplication.java b/web/src/main/java/com/imitate/web/WebApplication.java index 5381067..b630d57 100644 --- a/web/src/main/java/com/imitate/web/WebApplication.java +++ b/web/src/main/java/com/imitate/web/WebApplication.java @@ -5,20 +5,21 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScans; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import tk.mybatis.spring.annotation.MapperScan; +import java.util.TimeZone; + @EnableWebMvc -@MapperScan(basePackages = { "com.imitate.web.persistence.mapper" }) -@ComponentScans(value = { @ComponentScan("com.imitate.common") }) +@MapperScan(basePackages = {"com.imitate.web.persistence.mapper"}) +@ComponentScans(value = {@ComponentScan("com.imitate.common")}) @SpringBootApplication public class WebApplication { - public static void main(String[] args) { + // 设置默认时区为北京时区 + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(WebApplication.class, args); } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsConfigService.java b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsConfigService.java index 3f64a9f..0371c56 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsConfigService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsConfigService.java @@ -25,26 +25,27 @@ public class AlgorithmArgsConfigService { @Autowired private AlgorithmArgsConfigMapper algorithmArgsConfigMapper; - public AlgorithmArgsConfig getById(Long id){ + public AlgorithmArgsConfig getById(Long id) { return algorithmArgsConfigMapper.selectByPrimaryKey(id); } - public int updateOrAdd(AlgorithmArgsConfig entity){ + public int updateOrAdd(AlgorithmArgsConfig entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return algorithmArgsConfigMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return algorithmArgsConfigMapper.updateByPrimaryKeySelective(entity); } } - public int delById(Long id){ + public int delById(Long id) { return algorithmArgsConfigMapper.deleteByPrimaryKey(id); } - public PageInfo pageList(AlgorithmArgsConfigListParam param){ + public PageInfo pageList(AlgorithmArgsConfigListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = algorithmArgsConfigMapper.selectAllByParam(param); return new PageInfo<>(list); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsDistributeService.java b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsDistributeService.java index 36fb8ae..db79db3 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsDistributeService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmArgsDistributeService.java @@ -25,26 +25,27 @@ public class AlgorithmArgsDistributeService { @Autowired private AlgorithmArgsDistributeMapper algorithmArgsDistributeMapper; - public AlgorithmArgsDistribute getById(Long id){ + public AlgorithmArgsDistribute getById(Long id) { return algorithmArgsDistributeMapper.selectByPrimaryKey(id); } - public int updateOrAdd(AlgorithmArgsDistribute entity){ + public int updateOrAdd(AlgorithmArgsDistribute entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return algorithmArgsDistributeMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return algorithmArgsDistributeMapper.updateByPrimaryKeySelective(entity); } } - public int delById(Long id){ + public int delById(Long id) { return algorithmArgsDistributeMapper.deleteByPrimaryKey(id); } - public PageInfo pageList(AlgorithmArgsDistributeListParam param){ + public PageInfo pageList(AlgorithmArgsDistributeListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = algorithmArgsDistributeMapper.selectAllByParam(param); return new PageInfo<>(list); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmConfigService.java b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmConfigService.java index 5cd6d5c..313e931 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmConfigService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmConfigService.java @@ -25,26 +25,27 @@ public class AlgorithmConfigService { @Autowired private AlgorithmConfigMapper algorithmConfigMapper; - public AlgorithmConfig getById(Long id){ + public AlgorithmConfig getById(Long id) { return algorithmConfigMapper.selectByPrimaryKey(id); } - public int updateOrAdd(AlgorithmConfig entity){ + public int updateOrAdd(AlgorithmConfig entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return algorithmConfigMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return algorithmConfigMapper.updateByPrimaryKeySelective(entity); } } - public int delById(Long id){ + public int delById(Long id) { return algorithmConfigMapper.deleteByPrimaryKey(id); } - public PageInfo pageList(AlgorithmConfigListParam param){ + public PageInfo pageList(AlgorithmConfigListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = algorithmConfigMapper.selectAllByParam(param); return new PageInfo<>(list); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmDistributeService.java b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmDistributeService.java index 95208af..2a05684 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmDistributeService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/AlgorithmDistributeService.java @@ -25,26 +25,27 @@ public class AlgorithmDistributeService { @Autowired private AlgorithmDistributeMapper algorithmDistributeMapper; - public AlgorithmDistribute getById(Long id){ + public AlgorithmDistribute getById(Long id) { return algorithmDistributeMapper.selectByPrimaryKey(id); } - public int updateOrAdd(AlgorithmDistribute entity){ + public int updateOrAdd(AlgorithmDistribute entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return algorithmDistributeMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return algorithmDistributeMapper.updateByPrimaryKeySelective(entity); } } - public int delById(Long id){ + public int delById(Long id) { return algorithmDistributeMapper.deleteByPrimaryKey(id); } - public PageInfo pageList(AlgorithmDistributeListParam param){ + public PageInfo pageList(AlgorithmDistributeListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = algorithmDistributeMapper.selectAllByParam(param); return new PageInfo<>(list); 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 a025944..fe984f8 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 @@ -1,13 +1,9 @@ package com.imitate.web.module.simulation.service; -import cn.hutool.core.date.DateUtil; -import com.aliyuncs.utils.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.imitate.web.params.ApplicationSystemParam; import com.imitate.web.persistence.beans.ApplicationSystem; -import com.imitate.web.persistence.beans.DataTerminal; -import com.imitate.web.persistence.beans.Device; import com.imitate.web.persistence.mapper.ApplicationSystemMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +24,7 @@ public class ApplicationSystemService { @Autowired private ApplicationSystemMapper applicationSystemMapper; - public ApplicationSystem getById(Long id){ + public ApplicationSystem getById(Long id) { return applicationSystemMapper.selectByPrimaryKey(id); } @@ -45,17 +41,18 @@ public class ApplicationSystemService { 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()); + example.createCriteria().andEqualTo("systemName", applicationSystem.getSystemName()); ApplicationSystem oneByExample = applicationSystemMapper.selectOneByExample(example); - if (null == applicationSystem.getId()){ - if (null!=oneByExample){ + if (null == applicationSystem.getId()) { + if (null != oneByExample) { return -1; } applicationSystem.setCreateTime(nowAsString); + applicationSystem.setUpdateTime(nowAsString); return applicationSystemMapper.insertSelective(applicationSystem); - }else { - if (null!=oneByExample && !applicationSystem.getId().equals(oneByExample.getId())){ + } else { + if (null != oneByExample && !applicationSystem.getId().equals(oneByExample.getId())) { return -1; } applicationSystem.setUpdateTime(nowAsString); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DataSyncInfoService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DataSyncInfoService.java index 9f0dba5..7a4fb6d 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DataSyncInfoService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DataSyncInfoService.java @@ -25,26 +25,27 @@ public class DataSyncInfoService { @Autowired private DataSyncInfoMapper dataSyncInfoMapper; - public DataSyncInfo getById(Long id){ + public DataSyncInfo getById(Long id) { return dataSyncInfoMapper.selectByPrimaryKey(id); } - public int updateOrAdd(DataSyncInfo entity){ + public int updateOrAdd(DataSyncInfo entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return dataSyncInfoMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return dataSyncInfoMapper.updateByPrimaryKeySelective(entity); } } - public int delById(Long id){ + public int delById(Long id) { return dataSyncInfoMapper.deleteByPrimaryKey(id); } - public PageInfo pageList(DataSyncInfoListParam param){ + public PageInfo pageList(DataSyncInfoListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = dataSyncInfoMapper.selectAllByParam(param); return new PageInfo<>(list); 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 65dd0b3..d6c2749 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 @@ -5,13 +5,11 @@ import com.alibaba.fastjson.JSONObject; import com.aliyuncs.utils.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.imitate.common.util.SimpleFileUtils; import com.imitate.web.params.DataTerminalParam; import com.imitate.web.persistence.beans.DataTerminal; import com.imitate.web.persistence.mapper.DataTerminalMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -31,50 +29,51 @@ public class DataTerminalService { @Autowired private DataTerminalMapper dataTerminalMapper; - public DataTerminal getById(Long id){ + public DataTerminal getById(Long id) { return dataTerminalMapper.getById(id); } - public int updateOrAdd(DataTerminal dataTerminal){ + 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")); + if (null == dataTerminal.getId()) { + if (StringUtils.isEmpty(dataTerminal.getName())) { + dataTerminal.setName("终端/服务器" + DateUtil.format(now, "yyyyMMddHHmmss")); } dataTerminal.setCreateTime(nowAsString); + dataTerminal.setUpdateTime(nowAsString); return dataTerminalMapper.insertSelective(dataTerminal); - }else { + } else { dataTerminal.setUpdateTime(nowAsString); return dataTerminalMapper.updateByPrimaryKeySelective(dataTerminal); } } - public int deleteById(Long id){ + public int deleteById(Long id) { return dataTerminalMapper.deleteByPrimaryKey(id); } - public PageInfo page(DataTerminalParam param){ + public PageInfo page(DataTerminalParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List deviceList = dataTerminalMapper.selectAllPro(param.getType()); PageInfo page = new PageInfo<>(deviceList); return page; } - public String resourceExport(Long id){ + public String resourceExport(Long id) { DataTerminal dataTerminal = dataTerminalMapper.getById(id); return JSONObject.toJSONString(dataTerminal); } - public Boolean isTerminalOpen(String type){ - if (null!=dataTerminalMapper.getTerminalOpen(type)){ + public Boolean isTerminalOpen(String type) { + if (null != dataTerminalMapper.getTerminalOpen(type)) { return Boolean.TRUE; } return Boolean.FALSE; } - public DataTerminal openTerminal(DataTerminal dataTerminal){ + public DataTerminal openTerminal(DataTerminal dataTerminal) { dataTerminal.setStatus(Boolean.TRUE); dataTerminalMapper.updateByPrimaryKeySelective(dataTerminal); return 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 055ad90..26efaa5 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 @@ -1,7 +1,5 @@ package com.imitate.web.module.simulation.service; -import cn.hutool.core.date.DateUtil; -import com.aliyuncs.utils.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.imitate.web.params.DeviceDataParam; @@ -30,10 +28,11 @@ public class DeviceDataService { LocalDateTime now = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); String nowAsString = formatter.format(now); - if (null == deviceData.getId()){ + if (null == deviceData.getId()) { deviceData.setCreateTime(nowAsString); + deviceData.setUpdateTime(nowAsString); return deviceDataMapper.insertSelective(deviceData); - }else { + } else { 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 ba54492..3ef103e 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 @@ -5,7 +5,6 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.imitate.web.params.DistributionListParam; import com.imitate.web.params.DistributionParam; -import com.imitate.web.persistence.beans.Device; import com.imitate.web.persistence.beans.DeviceDistribution; import com.imitate.web.persistence.mapper.DeviceDistributionMapper; import com.imitate.web.persistence.mapper.DeviceMapper; @@ -33,40 +32,41 @@ public class DeviceDistributionService { @Autowired private DeviceMapper deviceMapper; - public PageInfo page(DistributionListParam param){ + public PageInfo page(DistributionListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = deviceDistributionMapper.selectAllPro(param); - list.forEach(e->{ + list.forEach(e -> { e.setDeviceCount(e.getDeviceList().size()); }); return new PageInfo<>(list); } @Transactional(rollbackFor = Exception.class) - public int editOrAdd(DistributionParam param){ + 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()){ + if (null == param.getId()) { param.setBeginTime(now); param.setCreateTime(nowAsString); - param.setEndTime(now.plusDays(30*3)); + param.setUpdateTime(nowAsString); + param.setEndTime(now.plusDays(30 * 3)); param.setStatus("1"); - param.setNumber("CK"+ DateUtil.format(now,"yyyyMMddHHmmss")); + param.setNumber("CK" + DateUtil.format(now, "yyyyMMddHHmmss")); lc = deviceDistributionMapper.insertSelective(param.getDeviceDistribution()); param.setDeviceCount(param.getDeviceList().size()); - param.getDeviceList().forEach(e->{ + param.getDeviceList().forEach(e -> { e.setUpdateTime(nowAsString); e.setDistributionId(param.getId()); deviceMapper.updateByPrimaryKeySelective(e); }); - }else { + } else { param.setUpdateTime(nowAsString); lc = deviceDistributionMapper.updateByPrimaryKeySelective(param.getDeviceDistribution()); deviceMapper.updateDistributionId(param.getId()); - param.getDeviceList().forEach(e->{ + param.getDeviceList().forEach(e -> { e.setUpdateTime(nowAsString); e.setDistributionId(param.getId()); deviceMapper.updateByPrimaryKeySelective(e); @@ -75,12 +75,12 @@ public class DeviceDistributionService { return lc; } - public DeviceDistribution getById(Long id){ + public DeviceDistribution getById(Long id) { return deviceDistributionMapper.getById(id); } @Transactional(rollbackFor = Exception.class) - public DeviceDistribution deleteById(Long id){ + public DeviceDistribution deleteById(Long id) { DeviceDistribution byId = deviceDistributionMapper.getById(id); //删除配发单 deviceDistributionMapper.deleteByPrimaryKey(id); 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 31832be..8f3e5fa 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 @@ -1,9 +1,7 @@ package com.imitate.web.module.simulation.service; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.LocalDateTimeUtil; import com.aliyuncs.utils.StringUtils; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.github.pagehelper.page.PageMethod; import com.imitate.web.params.DeviceHardParam; @@ -38,20 +36,21 @@ public class DeviceHardService { String nowAsString = formatter.format(now); Example example = new Example(DeviceHard.class); - example.createCriteria().andEqualTo("deviceNumber",deviceHard.getDeviceNumber()); + example.createCriteria().andEqualTo("deviceNumber", deviceHard.getDeviceNumber()); DeviceHard oneByExample = deviceHardMapper.selectOneByExample(example); - if (null == deviceHard.getId()){ - if (null!=oneByExample){ + if (null == deviceHard.getId()) { + if (null != oneByExample) { return -1; } - if(StringUtils.isEmpty(deviceHard.getDeviceName())){ - deviceHard.setDeviceName("设备"+ DateUtil.format(now,"yyyyMMddHHmmss")); + if (StringUtils.isEmpty(deviceHard.getDeviceName())) { + deviceHard.setDeviceName("设备" + DateUtil.format(now, "yyyyMMddHHmmss")); } deviceHard.setCreateTime(nowAsString); + deviceHard.setUpdateTime(nowAsString); return deviceHardMapper.insertSelective(deviceHard); - }else { - if (null!=oneByExample && !deviceHard.getId().equals(oneByExample.getId())){ + } else { + if (null != oneByExample && !deviceHard.getId().equals(oneByExample.getId())) { return -1; } deviceHard.setUpdateTime(nowAsString); @@ -65,6 +64,7 @@ public class DeviceHardService { /** * 查询设备列表 + * * @param param * @return */ @@ -78,6 +78,7 @@ public class DeviceHardService { /** * 查找设备，指定条件 + * * @param param * @return */ @@ -98,10 +99,10 @@ public class DeviceHardService { Optional.ofNullable(param.getConnFlag()).ifPresent(v -> criteria.andEqualTo("connFlag", v)); Date startDate = param.getStartDate(); Date endDate = param.getEndDate(); - if (startDate != null && endDate != null){ + if (startDate != null && endDate != null) { LocalDateTime start = startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); LocalDateTime end = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); - criteria.andBetween("createTime",start, end); + criteria.andBetween("createTime", start, end); } List list = deviceHardMapper.selectByExample(example); @@ -111,10 +112,10 @@ public class DeviceHardService { public int addList(List deviceParamList) { List list = deviceParamList.stream().map(DeviceHardParam::getDeviceHard).collect(Collectors.toList()); - for (DeviceHardParam e : deviceParamList){ + for (DeviceHardParam e : deviceParamList) { Example example = new Example(DeviceHard.class); - example.createCriteria().andEqualTo("deviceNumber",e.getDeviceNumber()); - if (null!=deviceHardMapper.selectOneByExample(example)){ + example.createCriteria().andEqualTo("deviceNumber", e.getDeviceNumber()); + if (null != deviceHardMapper.selectOneByExample(example)) { return -1; } } 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 b1e3fb5..c877bce 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,17 +1,15 @@ 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; - import com.imitate.web.persistence.beans.DeviceInit; import com.imitate.web.persistence.mapper.DeviceInitMapper; - +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import tk.mybatis.mapper.entity.Example; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; + @Service public class DeviceInitService { @@ -23,7 +21,7 @@ public class DeviceInitService { /** * 设备初装 */ - public DeviceInit initDevice(String fileName){ + public DeviceInit initDevice(String fileName) { //根据导入不同胡压缩包 最终生产对应内容 DeviceInit deviceInit = new DeviceInit(); LocalDateTime now = LocalDateTime.now(); @@ -31,7 +29,8 @@ public class DeviceInitService { String nowAsString = formatter.format(now); deviceInit.setSecret("aGVsbG93b3JsZAo="); deviceInit.setAlgorithm("Y2Fuc2h1Cg=="); - deviceInit.setSelfInspectionCode("emlqaWFubWEK");; + deviceInit.setSelfInspectionCode("emlqaWFubWEK"); + ; deviceInit.setDeviceName("X设备"); deviceInit.setInitNumber("D:\\"); deviceInit.setVersionNumber("v1.0"); @@ -45,12 +44,13 @@ public class DeviceInitService { Example example = new Example(DeviceInit.class); - example.createCriteria().andEqualTo("fileName",fileName); + example.createCriteria().andEqualTo("fileName", fileName); List list = deviceInitMapper.selectByExample(example); - if(list.size() > 0){ + if (list.size() > 0) { deviceInit.setId(list.get(0).getId()); deviceInitMapper.updateByPrimaryKeySelective(deviceInit); - }else{ + } else { + deviceInit.setUpdateTime(nowAsString); deviceInitMapper.insertSelective(deviceInit); } @@ -60,9 +60,9 @@ public class DeviceInitService { /** * 设备安装 */ - public int installDevice(){ + public int installDevice() { List list = deviceInitMapper.selectAll(); - if(list.size() > 0){ + if (!list.isEmpty()) { LocalDateTime now = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); String nowAsString = formatter.format(now); @@ -78,14 +78,13 @@ public class DeviceInitService { /** * 开机认证 */ - public DeviceInit onPowerAuth(){ + public DeviceInit onPowerAuth() { List list = deviceInitMapper.selectAll(); - if(list.size() > 0){ + if (list.size() > 0) { return list.get(0); } return null; } - } 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 c4b2d04..5b06b34 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 @@ -5,14 +5,14 @@ import com.alibaba.fastjson.JSONObject; import com.aliyuncs.utils.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.imitate.web.params.DeviceListParam; import com.imitate.web.params.DeviceParam; +import com.imitate.web.persistence.beans.Device; import com.imitate.web.persistence.beans.DeviceType; +import com.imitate.web.persistence.beans.Producer; +import com.imitate.web.persistence.mapper.DeviceMapper; import com.imitate.web.persistence.mapper.DeviceTypeMapper; import com.imitate.web.persistence.mapper.ProducerMapper; -import com.imitate.web.persistence.beans.Device; -import com.imitate.web.persistence.mapper.DeviceMapper; -import com.imitate.web.persistence.beans.Producer; -import com.imitate.web.params.DeviceListParam; import com.imitate.web.vo.DeviceByTypeVO; import com.imitate.web.vo.DeviceVO; import org.springframework.beans.BeanUtils; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * @since 2022-07-14 */ @Service -public class DeviceService{ +public class DeviceService { @Autowired private DeviceMapper deviceMapper; @@ -46,31 +46,32 @@ public class DeviceService{ @Autowired private DeviceTypeMapper deviceTypeMapper; - public Device getById(Long id){ + public Device getById(Long id) { return deviceMapper.getById(id); } - public int updateOrAddDevice(Device device){ + 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()); + example.createCriteria().andEqualTo("deviceId", device.getDeviceId()); Device oneByExample = deviceMapper.selectOneByExample(example); - if (null == device.getId()){ - if (null!=oneByExample){ + if (null == device.getId()) { + if (null != oneByExample) { return -1; } - if(StringUtils.isEmpty(device.getName())){ - device.setName("设备"+ DateUtil.format(now,"yyyyMMddHHmmss")); + if (StringUtils.isEmpty(device.getName())) { + device.setName("设备" + DateUtil.format(now, "yyyyMMddHHmmss")); } device.setAddTime(now); device.setCreateTime(nowAsString); + device.setUpdateTime(nowAsString); return deviceMapper.insertSelective(device); - }else { - if (null!=oneByExample && !device.getId().equals(oneByExample.getId())){ + } else { + if (null != oneByExample && !device.getId().equals(oneByExample.getId())) { return -1; } device.setUpdateTime(nowAsString); @@ -78,18 +79,18 @@ public class DeviceService{ } } - public int deleteDeviceById(Long id){ + public int deleteDeviceById(Long id) { return deviceMapper.deleteByPrimaryKey(id); } - public List listDevice(DeviceListParam param){ + public List listDevice(DeviceListParam param) { return deviceMapper.selectAllPro(param); } - public List listDeviceByType(){ + public List listDeviceByType() { List deviceList = deviceMapper.selectDeviceByType(); List deviceByTypeVOList = new ArrayList<>(); - deviceList.forEach(e->{ + deviceList.forEach(e -> { DeviceByTypeVO deviceByTypeVO = new DeviceByTypeVO(); deviceByTypeVO.setType(e.getType()); deviceByTypeVO.setDeviceList(e.getDeviceList()); @@ -98,24 +99,24 @@ public class DeviceService{ return deviceByTypeVOList; } - public List listByType(String type){ + public List listByType(String type) { Example example = new Example(Device.class); - example.createCriteria().andEqualTo("type",type); + example.createCriteria().andEqualTo("type", type); return deviceMapper.selectByExample(example); } - public List list(DeviceListParam param){ + public List list(DeviceListParam param) { return deviceMapper.selectAllPro(param); } - public PageInfo pageDevice(DeviceListParam param){ + public PageInfo pageDevice(DeviceListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List deviceList = deviceMapper.selectAllPro(param); return new PageInfo<>(deviceList); } - public List addExcelList(List deviceVOList){ - if (null==deviceVOList || deviceVOList.size()<=0){ + public List addExcelList(List deviceVOList) { + if (null == deviceVOList || deviceVOList.size() <= 0) { return null; } //将厂商列转为map @@ -134,58 +135,59 @@ public class DeviceService{ for (DeviceVO vo : deviceVOList) { //判断是否已存在编号 Example example = new Example(Device.class); - example.createCriteria().andEqualTo("deviceId",vo.getDeviceId()); - if (null!=deviceMapper.selectOneByExample(example)){ + example.createCriteria().andEqualTo("deviceId", vo.getDeviceId()); + if (null != deviceMapper.selectOneByExample(example)) { continue; } Device device = new Device(); - BeanUtils.copyProperties(vo,device); + BeanUtils.copyProperties(vo, device); device.setAddTime(now); device.setCreateTime(nowAsString); - device.setType(typeMaps.getOrDefault(vo.getTypeName(),0L)); - device.setProducerId(producerMaps.getOrDefault(vo.getProducerName(),0L)); + device.setType(typeMaps.getOrDefault(vo.getTypeName(), 0L)); + device.setProducerId(producerMaps.getOrDefault(vo.getProducerName(), 0L)); deviceList.add(device); } deviceMapper.insertList(deviceList); return deviceList; } - public int addList(List deviceParamList){ + public int addList(List deviceParamList) { List deviceList = deviceParamList.stream().map(DeviceParam::getDevice).collect(Collectors.toList()); - for (DeviceParam e : deviceParamList){ + for (DeviceParam e : deviceParamList) { Example example = new Example(Device.class); - example.createCriteria().andEqualTo("deviceId",e.getDeviceId()); - if (null!=deviceMapper.selectOneByExample(example)){ + example.createCriteria().andEqualTo("deviceId", e.getDeviceId()); + if (null != deviceMapper.selectOneByExample(example)) { return -1; } e.setAddTime(LocalDateTime.now()); e.setStatus("0"); e.setDistributionId(0L); - }; + } + ; return deviceMapper.insertList(deviceList); } @Transactional(rollbackFor = Exception.class) - public int configureDevice(DeviceListParam param){ + public int configureDevice(DeviceListParam param) { List deviceList = param.getDeviceList(); - deviceList.forEach(e-> deviceMapper.updateByPrimaryKeySelective(e)); + deviceList.forEach(e -> deviceMapper.updateByPrimaryKeySelective(e)); return 1; } @Transactional(rollbackFor = Exception.class) - public int deleteByList(List deviceList){ - deviceList.forEach(d-> deviceMapper.deleteByPrimaryKey(d.getId())); + public int deleteByList(List deviceList) { + deviceList.forEach(d -> deviceMapper.deleteByPrimaryKey(d.getId())); return 1; } - public JSONObject u3dDevice(Integer u3dType){ + public JSONObject u3dDevice(Integer u3dType) { String res = ""; //注意id为负数，且id和deviceId不能重复 - if (1 == u3dType){ + if (1 == u3dType) { res = "{\"list\":[{\"id\":-10,\"name\":\"注入器1\",\"u3dType\":1,\"deviceId\":\"202209071223\"},{\"id\":-11,\"name\":\"注入器2\",\"u3dType\":1,\"deviceId\":\"202209071224\"}]}"; - }else if (2 == u3dType){ + } else if (2 == u3dType) { res = "{\"list\":[{\"id\":-20,\"name\":\"开机棒1\",\"u3dType\":2,\"deviceId\":\"202209072223\"},{\"id\":-21,\"name\":\"开机棒2\",\"u3dType\":2,\"deviceId\":\"202209072224\"}]}"; - }else if (3 == u3dType){ + } else if (3 == u3dType) { res = "{\"list\":[{\"id\":-30,\"name\":\"授启棒1\",\"u3dType\":3,\"deviceId\":\"202209073223\"},{\"id\":-31,\"name\":\"授启棒2\",\"u3dType\":3,\"deviceId\":\"202209073224\"}]}"; } return JSONObject.parseObject(res); 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 f627a24..a6347b2 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 @@ -2,11 +2,11 @@ package com.imitate.web.module.simulation.service; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.imitate.web.persistence.mapper.DeviceTypeMapper; -import com.imitate.web.persistence.mapper.DeviceTypeProducerMapper; +import com.imitate.web.params.DeviceTypeParam; import com.imitate.web.persistence.beans.DeviceType; import com.imitate.web.persistence.beans.DeviceTypeProducer; -import com.imitate.web.params.DeviceTypeParam; +import com.imitate.web.persistence.mapper.DeviceTypeMapper; +import com.imitate.web.persistence.mapper.DeviceTypeProducerMapper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,19 +34,19 @@ public class DeviceTypeService { @Autowired private DeviceTypeProducerMapper typeProducerMapper; - public DeviceType getById(Long id){ + public DeviceType getById(Long id) { return deviceTypeMapper.getById(id); } @Transactional(rollbackFor = Exception.class) - public int deleteById(Long id){ + public int deleteById(Long id) { //删除所有 类型-厂商 中间表 typeProducerMapper.deleteByTypeId(id); return deviceTypeMapper.deleteByPrimaryKey(id); } @Transactional(rollbackFor = Exception.class) - public int deleteByTypeList(List deviceTypeList){ + public int deleteByTypeList(List deviceTypeList) { deviceTypeList.forEach(deviceType -> { typeProducerMapper.deleteByTypeId(deviceType.getId()); deviceTypeMapper.deleteByPrimaryKey(deviceType.getId()); @@ -55,31 +55,32 @@ public class DeviceTypeService { } @Transactional(rollbackFor = Exception.class) - public int updateOrAddProducer(DeviceTypeParam deviceTypeParam){ + 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); + BeanUtils.copyProperties(deviceTypeParam, deviceType); List typeProducerList = new ArrayList<>(); Example example = new Example(DeviceType.class); - example.createCriteria().andEqualTo("typeNumber",deviceTypeParam.getTypeNumber()); + example.createCriteria().andEqualTo("typeNumber", deviceTypeParam.getTypeNumber()); DeviceType oneByExample = deviceTypeMapper.selectOneByExample(example); - if (deviceTypeParam.getId() == null){ - if (null!=oneByExample){ + if (deviceTypeParam.getId() == null) { + if (null != oneByExample) { return -1; } //新增设备类型 deviceType.setCreateTime(nowAsString); + deviceType.setUpdateTime(nowAsString); int i = deviceTypeMapper.insertSelective(deviceType); - if (null == deviceTypeParam.getProducerIdList() || i<0){ + if (null == deviceTypeParam.getProducerIdList() || i < 0) { return i; } //批量新增 设备类型-厂商 中间表 - deviceTypeParam.getProducerIdList().forEach(pid->{ + deviceTypeParam.getProducerIdList().forEach(pid -> { DeviceTypeProducer deviceTypeProducer = new DeviceTypeProducer(); deviceTypeProducer.setTypeId(deviceType.getId()); deviceTypeProducer.setProducerId(pid); @@ -88,15 +89,15 @@ public class DeviceTypeService { }); typeProducerMapper.insertList(typeProducerList); return i; - }else { - if (null!=oneByExample && !deviceTypeParam.getId().equals(oneByExample.getId())){ + } else { + if (null != oneByExample && !deviceTypeParam.getId().equals(oneByExample.getId())) { return -1; } //先删除所有该设备类型与厂商的中间表，再新增。 typeProducerMapper.deleteByTypeId(deviceType.getId()); - if (null != deviceTypeParam.getProducerIdList()){ + if (null != deviceTypeParam.getProducerIdList()) { //批量新增 设备类型-厂商 中间表 - deviceTypeParam.getProducerIdList().forEach(pid->{ + deviceTypeParam.getProducerIdList().forEach(pid -> { DeviceTypeProducer deviceTypeProducer = new DeviceTypeProducer(); deviceTypeProducer.setTypeId(deviceType.getId()); deviceTypeProducer.setProducerId(pid); @@ -112,20 +113,20 @@ public class DeviceTypeService { } @Transactional(rollbackFor = Exception.class) - public int addByList(List typeParamList){ + public int addByList(List typeParamList) { int sum = 0; - for (DeviceTypeParam param : typeParamList){ + for (DeviceTypeParam param : typeParamList) { int i = updateOrAddProducer(param); - sum+=i; + sum += i; } return sum; } - public List list(){ + public List list() { return deviceTypeMapper.selectAll(); } - public PageInfo page(DeviceTypeParam param){ + public PageInfo page(DeviceTypeParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List typeList = deviceTypeMapper.selectByKey(param); return new PageInfo<>(typeList); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/DutyAreaInfoService.java b/web/src/main/java/com/imitate/web/module/simulation/service/DutyAreaInfoService.java index f726e7a..1167e37 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/DutyAreaInfoService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/DutyAreaInfoService.java @@ -25,26 +25,27 @@ public class DutyAreaInfoService { @Autowired private DutyAreaInfoMapper dutyAreaInfoMapper; - public DutyAreaInfo getById(Long id){ + public DutyAreaInfo getById(Long id) { return dutyAreaInfoMapper.selectByPrimaryKey(id); } - public PageInfo pageList(DutyAreaInfoListParam param){ + public PageInfo pageList(DutyAreaInfoListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List dutyAreaInfos = dutyAreaInfoMapper.selectAllByParam(param); return new PageInfo<>(dutyAreaInfos); } - public int delById(Long id){ + public int delById(Long id) { return dutyAreaInfoMapper.deleteByPrimaryKey(id); } - public int updateOrAdd(DutyAreaInfo dutyAreaInfo){ + public int updateOrAdd(DutyAreaInfo dutyAreaInfo) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (dutyAreaInfo.getId() == null){ + if (dutyAreaInfo.getId() == null) { dutyAreaInfo.setCreateTime(nowStr); + dutyAreaInfo.setUpdateTime(nowStr); return dutyAreaInfoMapper.insertSelective(dutyAreaInfo); - }else { + } else { dutyAreaInfo.setUpdateTime(nowStr); return dutyAreaInfoMapper.updateByPrimaryKeySelective(dutyAreaInfo); } 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 d91ba5a..e7df8bb 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 @@ -23,14 +23,15 @@ public class ManagerSystemService { @Autowired private ManagerSystemMapper managerSystemMapper; - public int updateOrAdd(ManagerSystem managerSystem){ + 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()){ + if (null == managerSystem.getId()) { managerSystem.setCreateTime(nowAsString); + managerSystem.setUpdateTime(nowAsString); return managerSystemMapper.insertSelective(managerSystem); - }else { + } else { managerSystem.setUpdateTime(nowAsString); return managerSystemMapper.updateByPrimaryKeySelective(managerSystem); } @@ -41,7 +42,7 @@ public class ManagerSystemService { return managerSystemMapper.selectByPrimaryKey(id); } - public PageInfo page(ManagerSystemParam param){ + public PageInfo page(ManagerSystemParam param) { PageMethod.startPage(param.getPageNumber(), param.getPageSize()); List list = managerSystemMapper.select(param.getManagerSystem()); return new PageInfo<>(list); 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 a6fa418..5442664 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,14 +1,14 @@ 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; +import cn.hutool.json.JSONArray; import com.imitate.web.persistence.beans.RemoteFileConfig; import com.imitate.web.persistence.mapper.RemoteFileConfigMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; -import cn.hutool.json.JSONArray; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; @Service public class NetGlqService { @@ -16,12 +16,11 @@ public class NetGlqService { @Autowired private RemoteFileConfigMapper remoteFileConfigMapper; - - /** * 网络隔离器信息 + * * @param type * @return */ @@ -49,7 +48,7 @@ public class NetGlqService { //日志记录信息 case 7: break; - + default: break; } @@ -59,6 +58,7 @@ public class NetGlqService { /** * 远程文件配置- 发送数据 + * * @param type * @param jsonStr */ @@ -68,9 +68,9 @@ public class NetGlqService { String nowAsString = formatter.format(now); List list = remoteFileConfigMapper.selectAll(); RemoteFileConfig remoteFileConfig = new RemoteFileConfig(); - if(list.size() > 0){ + if (list.size() > 0) { remoteFileConfig = list.get(0); - }else{ + } else { remoteFileConfig.setId(1L); } @@ -105,6 +105,7 @@ public class NetGlqService { /** * 清空远程配置信息 + * * @param type */ public void cleanRemoteConfig(Integer type) { @@ -113,36 +114,36 @@ public class NetGlqService { String nowAsString = formatter.format(now); List list = remoteFileConfigMapper.selectAll(); RemoteFileConfig remoteFileConfig = new RemoteFileConfig(); - if(list.size() > 0){ + if (list.size() > 0) { remoteFileConfig = list.get(0); switch (type) { - //服务器列表信息 - case 1: - remoteFileConfig.setServiceList(null); - break; - //网络配置信息 - case 2: - remoteFileConfig.setNetParam(null); - break; - //安全策略信息 - case 3: - remoteFileConfig.setSafeStrategy(null); - break; - //管理配置信息 - case 4: - remoteFileConfig.setManagerStrategy(null); - break; - //VPN策略信息 - case 5: - remoteFileConfig.setVpnStrategy(null); - break; - default: - remoteFileConfig.setUpdateTime(nowAsString); - remoteFileConfigMapper.updateByPrimaryKeySelective(remoteFileConfig); - break; + //服务器列表信息 + case 1: + remoteFileConfig.setServiceList(null); + break; + //网络配置信息 + case 2: + remoteFileConfig.setNetParam(null); + break; + //安全策略信息 + case 3: + remoteFileConfig.setSafeStrategy(null); + break; + //管理配置信息 + case 4: + remoteFileConfig.setManagerStrategy(null); + break; + //VPN策略信息 + case 5: + remoteFileConfig.setVpnStrategy(null); + break; + default: + 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 939975a..aa58060 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,14 +1,14 @@ 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; - import com.aliyuncs.utils.StringUtils; import com.imitate.web.persistence.beans.ParameterSet; import com.imitate.web.persistence.mapper.ParameterSetMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; @Service public class ParameterSetService { @@ -18,24 +18,29 @@ public class ParameterSetService { private ParameterSetMapper parameterSetMapper; - - - public Integer 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"); + @Transactional + public Integer updateOrAdd(ParameterSet parameterSet) { + try { + // 执行数据库操作，包括插入操作 + 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(nowAsString); + parameterSet.setUpdateTime(nowAsString); + return parameterSetMapper.insertSelective(parameterSet); + } else { + parameterSet.setUpdateTime(nowAsString); + return parameterSetMapper.updateByPrimaryKeySelective(parameterSet); } - parameterSet.setCreateTime(nowAsString); - return parameterSetMapper.insertSelective(parameterSet); - }else { - parameterSet.setUpdateTime(nowAsString); - return parameterSetMapper.updateByPrimaryKeySelective(parameterSet); + } catch (Exception e) { + e.printStackTrace(); } + return 0; } - } 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 68ea7d8..611915c 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 @@ -2,8 +2,8 @@ package com.imitate.web.module.simulation.service; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.imitate.web.persistence.mapper.DeviceMapper; import com.imitate.web.persistence.beans.Producer; +import com.imitate.web.persistence.mapper.DeviceMapper; import com.imitate.web.persistence.mapper.ProducerMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,35 +28,36 @@ public class ProducerService { @Autowired private DeviceMapper deviceMapper; - public Producer getById(Long id){ + public Producer getById(Long id) { return producerMapper.selectByPrimaryKey(id); } - public int updateOrAddProducer(Producer producer){ + 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){ + if (producer.getId() == null) { producer.setCreateTime(nowAsString); + producer.setUpdateTime(nowAsString); return producerMapper.insertSelective(producer); - }else { + } else { producer.setUpdateTime(nowAsString); return producerMapper.updateByPrimaryKey(producer); } } - public int deleteProducerById(Long id){ - if (deviceMapper.selectCountById(id)>0){ + public int deleteProducerById(Long id) { + if (deviceMapper.selectCountById(id) > 0) { return -1; } return producerMapper.deleteByPrimaryKey(id); } - public List listProducer(){ + public List listProducer() { return producerMapper.selectAll(); } - public PageInfo pageProducer(Integer pageNum, Integer pageSize){ + public PageInfo pageProducer(Integer pageNum, Integer pageSize) { PageHelper.startPage(pageNum, pageSize); List producerList = producerMapper.selectAll(); PageInfo page = new PageInfo<>(producerList); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/SecretBodyService.java b/web/src/main/java/com/imitate/web/module/simulation/service/SecretBodyService.java index 032e94d..250724a 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/SecretBodyService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/SecretBodyService.java @@ -1,10 +1,5 @@ package com.imitate.web.module.simulation.service; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.imitate.web.params.ClearTextKeyBodyParam; @@ -31,6 +26,13 @@ import com.imitate.web.persistence.mapper.SecretImportMapper; import com.imitate.web.persistence.mapper.SecretIssueMailboxMapper; import com.imitate.web.persistence.mapper.SecretIssuePrivateMapper; import com.imitate.web.persistence.mapper.SecretIssueSubordinateMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; @Service public class SecretBodyService { @@ -64,8 +66,6 @@ public class SecretBodyService { @Autowired private EncryptedKeyBodyMapper encryptedKeyBodyMapper; - - /** * 密钥体导入 @@ -74,11 +74,11 @@ public class SecretBodyService { //1 . 每次导入先清空表 secretFormatMapper.deleteAll(); //2. 判断导入文件的正确性,模拟导入文件 - if(fileName.equals("aaaaa.zip")){ + if (fileName.equals("aaaaa.zip")) { List list = new ArrayList<>(); - list.add(new SecretFormat("AAA111","载体名称01","三寸","AAA.txt","管理系统名称0-1","管理系统标识","产品名称","未发布","软盘","在线向密钥编制分系统")); - list.add(new SecretFormat("AAA222","载体名称02","六寸","BBB.txt","管理系统名称0-2","管理系统标识","产品名称","未发布","移动盘","离线向密钥编制分系统")); - list.add(new SecretFormat("AAA333","载体名称02","八寸","CCC.txt","管理系统名称0-3","管理系统标识","产品名称","未发布","光盘","在线向下级管理系统")); + list.add(new SecretFormat("AAA111", "载体名称01", "三寸", "AAA.txt", "管理系统名称0-1", "管理系统标识", "产品名称", "未发布", "软盘", "在线向密钥编制分系统")); + list.add(new SecretFormat("AAA222", "载体名称02", "六寸", "BBB.txt", "管理系统名称0-2", "管理系统标识", "产品名称", "未发布", "移动盘", "离线向密钥编制分系统")); + list.add(new SecretFormat("AAA333", "载体名称02", "八寸", "CCC.txt", "管理系统名称0-3", "管理系统标识", "产品名称", "未发布", "光盘", "在线向下级管理系统")); secretFormatMapper.insertList(list); } } @@ -86,11 +86,12 @@ public class SecretBodyService { /** * 更新已发布状态 + * * @param id */ - public void publisherSecret(Integer id){ + public void publisherSecret(Integer id) { SecretFormat secretFormat = secretFormatMapper.selectByPrimaryKey(id); - if(secretFormat != null){ + if (secretFormat != null) { secretFormat.setCurrentStatus("已发布"); secretFormatMapper.updateByPrimaryKeySelective(secretFormat); } @@ -107,19 +108,19 @@ public class SecretBodyService { } - - /** * 密钥体申请 + * * @param param */ - public void addSecretAsk(SecretAskParam param){ + public void addSecretAsk(SecretAskParam param) { secretAskMapper.insertSelective(param.getSecretAsk()); } /** * 密钥体导入 + * * @param productNumber * @param fileName */ @@ -128,7 +129,7 @@ public class SecretBodyService { secretImportMapper.deleteAll(); // 2 判断导入文件的正确性,模拟导入文件 - if(fileName.equals("aaaa.zip")){ + if (fileName.equals("aaaa.zip")) { List list = new ArrayList<>(); SecretImport secretImport = new SecretImport(); secretImport.setProductName("AAA111"); @@ -177,10 +178,9 @@ public class SecretBodyService { } - - /** * 密钥体列表 + * * @param param * @return */ @@ -192,11 +192,12 @@ public class SecretBodyService { /** - * 密钥体导入 - 修改状态 + * 密钥体导入 - 修改状态 + * * @param type 1.删除 2. 还原 3.清理 - * @param id + * @param id */ - public void updateStatus(Integer type,Integer id){ + public void updateStatus(Integer type, Integer id) { SecretImport secretImport; switch (type) { case 1: @@ -204,14 +205,14 @@ public class SecretBodyService { break; case 2: secretImport = secretImportMapper.selectByPrimaryKey(id); - if(secretImport != null){ + if (secretImport != null) { secretImport.setIsClean(0); secretImportMapper.updateByPrimaryKeySelective(secretImport); } break; case 3: secretImport = secretImportMapper.selectByPrimaryKey(id); - if(secretImport != null){ + if (secretImport != null) { secretImport.setIsClean(1); secretImportMapper.updateByPrimaryKeySelective(secretImport); } @@ -224,11 +225,15 @@ public class SecretBodyService { /** * 密钥体导入 - 添加密钥体接收单 - * @param id 导入的 密钥体列表中某条记录的id 状态改为已使用 + * + * @param id 导入的 密钥体列表中某条记录的id 状态改为已使用 */ - public void addSecretBodyAcceptance(Integer id){ + public void addSecretBodyAcceptance(Integer id) { + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); SecretImport secretImport = secretImportMapper.selectByPrimaryKey(id); - if(secretImport != null){ + if (secretImport != null) { secretImport.setCurrentStatus("已使用"); secretImportMapper.updateByPrimaryKeySelective(secretImport); @@ -246,15 +251,16 @@ public class SecretBodyService { secretBodyAcceptance.setCodeCarriers(secretImport.getApplyModel()); secretBodyAcceptance.setNumber(secretImport.getNumber()); secretBodyAcceptance.setNotes("备注"); + secretBodyAcceptance.setCreateTime(nowAsString); + secretBodyAcceptance.setUpdateTime(nowAsString); secretBodyAcceptanceMapper.insertSelective(secretBodyAcceptance); } } - - /** * 密钥体导入-密钥体接收单列表 + * * @param param * @return */ @@ -265,13 +271,12 @@ public class SecretBodyService { } - - /** * 密钥体配发 - 向下级配发列表 + * * @return */ - public PageInfo belowIssueList(SecretIssueSubordinateParam param){ + public PageInfo belowIssueList(SecretIssueSubordinateParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = secretIssueSubordinateMapper.selectAllByParam(param); return new PageInfo<>(list); @@ -280,6 +285,7 @@ public class SecretBodyService { /** * 密钥体配发 - 邮箱配发列表 + * * @param param * @return */ @@ -290,9 +296,9 @@ public class SecretBodyService { } - /** * 密钥体配发 - 向专用密码管理系统配发列表 + * * @param param * @return */ @@ -301,80 +307,83 @@ public class SecretBodyService { List list = secretIssuePrivateMapper.selectAllByParam(param); return new PageInfo<>(list); } - - - /** * 密钥体配发 - 1 向下级配发 2 向邮箱配发 3 向专用密码管理系统配发 + * * @param id */ public void issue(Integer type, Integer id) { + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); SecretImport secretImport = secretImportMapper.selectByPrimaryKey(id); if (secretImport != null) { secretImport.setCurrentStatus("已使用"); + secretImport.setUpdateTime(nowAsString); secretImportMapper.updateByPrimaryKeySelective(secretImport); switch (type) { - case 1: - // 向下级配发 - SecretIssueSubordinate secretIssueSubordinate = new SecretIssueSubordinate(); - secretIssueSubordinate.setProductName(secretImport.getProductName()); - secretIssueSubordinate.setProductNum(secretImport.getProductNum()); - secretIssueSubordinate.setCarrierType(secretImport.getCarrierType()); - secretIssueSubordinate.setApplyModel(secretImport.getApplyModel()); - secretIssueSubordinate.setDistManagerName("配发管理系统名称"); - secretIssueSubordinate.setDistManagerIdentifer("配发管理系统实体标识"); - secretIssueSubordinate.setIssueNum(secretImport.getNumber()); - secretIssueSubordinate.setIssueStatus("已配发"); - secretIssueSubordinate.setDelNotes("删除标志"); - secretIssueSubordinate.setSubOperateTime(LocalDateTime.now()); - secretIssueSubordinate.setApplyManagerSysName("申请管理系统名称"); - secretIssueSubordinate.setApplyManagerModelName("申请管理系统实体标识"); - secretIssueSubordinate.setQuantity(secretImport.getApplyNum()); - secretIssueSubordinate.setQuantityTime(LocalDateTime.now()); - secretIssueSubordinate.setDistCode("配发编号"); - secretIssueSubordinate.setApplyCode("申请编号"); - secretIssueSubordinateMapper.insertSelective(secretIssueSubordinate); - break; - case 2: - // 向邮箱配发 - SecretIssueMailbox secretIssueMailbox = new SecretIssueMailbox(); - secretIssueMailbox.setKeyDistPlatformName("密钥分发平台名称"); - secretIssueMailbox.setKeyDistPlatformEntity("密钥分发平台实体标识"); - secretIssueMailbox.setProductName(secretImport.getProductName()); - secretIssueMailbox.setProductCode(secretImport.getProductNum()); - secretIssueMailbox.setApplyType(secretImport.getCarrierType()); - secretIssueMailbox.setApplyModel(secretImport.getApplyModel()); - secretIssueMailbox.setTotal(secretImport.getNumber()); - secretIssueMailbox.setDownloadNum(35); - secretIssueMailbox.setEmpower("授权"); - secretIssueMailbox.setPriority("优先级"); - secretIssueMailbox.setOverTime(LocalDateTime.now()); - secretIssueMailbox.setNotificationFlag("通知标志"); - secretIssueMailbox.setDeleteFlag("删除标志"); - secretIssueMailboxMapper.insertSelective(secretIssueMailbox); - break; - default: - // 向专用密码管理系统配发 - SecretIssuePrivate secretIssuePrivate = new SecretIssuePrivate(); - secretIssuePrivate.setProductName(secretImport.getProductName()); - secretIssuePrivate.setProductCode(secretImport.getProductNum()); - secretIssuePrivate.setIssueManagerSysName("配发管理系统名称"); - secretIssuePrivate.setSyncStatus("已同步"); - secretIssuePrivateMapper.insertSelective(secretIssuePrivate); - break; + case 1: + // 向下级配发 + SecretIssueSubordinate secretIssueSubordinate = new SecretIssueSubordinate(); + secretIssueSubordinate.setProductName(secretImport.getProductName()); + secretIssueSubordinate.setProductNum(secretImport.getProductNum()); + secretIssueSubordinate.setCarrierType(secretImport.getCarrierType()); + secretIssueSubordinate.setApplyModel(secretImport.getApplyModel()); + secretIssueSubordinate.setDistManagerName("配发管理系统名称"); + secretIssueSubordinate.setDistManagerIdentifer("配发管理系统实体标识"); + secretIssueSubordinate.setIssueNum(secretImport.getNumber()); + secretIssueSubordinate.setIssueStatus("已配发"); + secretIssueSubordinate.setDelNotes("删除标志"); + secretIssueSubordinate.setSubOperateTime(LocalDateTime.now()); + secretIssueSubordinate.setApplyManagerSysName("申请管理系统名称"); + secretIssueSubordinate.setApplyManagerModelName("申请管理系统实体标识"); + secretIssueSubordinate.setQuantity(secretImport.getApplyNum()); + secretIssueSubordinate.setQuantityTime(nowAsString); + secretIssueSubordinate.setDistCode("配发编号"); + secretIssueSubordinate.setApplyCode("申请编号"); + secretIssueSubordinate.setUpdateTime(nowAsString); + secretIssueSubordinateMapper.insertSelective(secretIssueSubordinate); + break; + case 2: + // 向邮箱配发 + SecretIssueMailbox secretIssueMailbox = new SecretIssueMailbox(); + secretIssueMailbox.setKeyDistPlatformName("密钥分发平台名称"); + secretIssueMailbox.setKeyDistPlatformEntity("密钥分发平台实体标识"); + secretIssueMailbox.setProductName(secretImport.getProductName()); + secretIssueMailbox.setProductCode(secretImport.getProductNum()); + secretIssueMailbox.setApplyType(secretImport.getCarrierType()); + secretIssueMailbox.setApplyModel(secretImport.getApplyModel()); + secretIssueMailbox.setTotal(secretImport.getNumber()); + secretIssueMailbox.setDownloadNum(35); + secretIssueMailbox.setEmpower("授权"); + secretIssueMailbox.setPriority("优先级"); + secretIssueMailbox.setOverTime(LocalDateTime.now()); + secretIssueMailbox.setNotificationFlag("通知标志"); + secretIssueMailbox.setDeleteFlag("删除标志"); + secretIssueMailbox.setCreateTime(nowAsString); + secretIssueMailbox.setUpdateTime(nowAsString); + secretIssueMailboxMapper.insertSelective(secretIssueMailbox); + break; + default: + // 向专用密码管理系统配发 + SecretIssuePrivate secretIssuePrivate = new SecretIssuePrivate(); + secretIssuePrivate.setProductName(secretImport.getProductName()); + secretIssuePrivate.setProductCode(secretImport.getProductNum()); + secretIssuePrivate.setIssueManagerSysName("配发管理系统名称"); + secretIssuePrivate.setSyncStatus("已同步"); + secretIssuePrivate.setCreateTime(nowAsString); + secretIssuePrivate.setUpdateTime(nowAsString); + secretIssuePrivateMapper.insertSelective(secretIssuePrivate); + break; } } - - - - } + } - /** * 密钥体载体包封 - 明文载体包封 */ @@ -391,20 +400,4 @@ public class SecretBodyService { } - - - - - - - - - - - - - - - - } \ No newline at end of file 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 d506a0b..967e4f5 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,30 +1,30 @@ 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; import com.imitate.web.persistence.beans.SecretInit; import com.imitate.web.persistence.mapper.SecretInitMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import tk.mybatis.mapper.entity.Example; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; + @Service public class SecretInitService { - + @Autowired private SecretInitMapper secretInitMapper; - - /** * 数据加载 + * * @param fileName * @return */ - public SecretInit dataLoadding(String fileName){ + public SecretInit dataLoadding(String fileName) { // 根据加载不同的文件 生成密码机初装数据 SecretInit secretInit = new SecretInit(); LocalDateTime now = LocalDateTime.now(); @@ -43,12 +43,12 @@ public class SecretInitService { secretInitMapper.selectCount(secretInit); Example example = new Example(SecretInit.class); - example.createCriteria().andEqualTo("fileName",fileName); + example.createCriteria().andEqualTo("fileName", fileName); List list = secretInitMapper.selectByExample(example); - if(list.size() > 0){ + if (list.size() > 0) { secretInit.setId(list.get(0).getId()); secretInitMapper.updateByPrimaryKeySelective(secretInit); - }else{ + } else { secretInitMapper.insertSelective(secretInit); } return secretInit; @@ -58,12 +58,12 @@ public class SecretInitService { /** * 发送数据 */ - public void sendData(){ + public void sendData() { LocalDateTime now = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); String nowAsString = formatter.format(now); List list = secretInitMapper.selectAll(); - if(list.size() > 0){ + if (list.size() > 0) { SecretInit secretInit = list.get(0); secretInit.setSecretDataStatus("已发送"); secretInit.setUpdateTime(nowAsString); @@ -75,16 +75,15 @@ public class SecretInitService { /** * 清空信息 */ - public void clean(){ + public void clean() { secretInitMapper.deleteAll(); } - /** * 1 密钥销毁 2 密钥遥毙 3 密钥机遥毙 */ - public SecretInit secretSendCmd(Integer type){ + public SecretInit secretSendCmd(Integer type) { SecretInit secretInit = secretInitMapper.selectAll().get(0); switch (type) { case 1: @@ -103,19 +102,14 @@ public class SecretInitService { } - /** * 状态查询 + * * @return */ - public SecretInit secretInfo(){ + public SecretInit secretInfo() { return secretInitMapper.selectAll().get(0); } - - - - - } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/SecretInstallService.java b/web/src/main/java/com/imitate/web/module/simulation/service/SecretInstallService.java index 00963d2..0e54319 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/SecretInstallService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/SecretInstallService.java @@ -1,10 +1,5 @@ package com.imitate.web.module.simulation.service; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.imitate.web.params.ManageSysDiskDataMaintenanceParam; @@ -14,12 +9,17 @@ import com.imitate.web.persistence.beans.SecretImport; import com.imitate.web.persistence.mapper.ManageSysDiskDataMaintenanceMapper; import com.imitate.web.persistence.mapper.ManagerSecretSettingMapper; import com.imitate.web.persistence.mapper.SecretImportMapper; +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; @Service public class SecretInstallService { - @Autowired private ManageSysDiskDataMaintenanceMapper manageSysDiskDataMaintenanceMapper; @@ -32,25 +32,29 @@ public class SecretInstallService { /** * 管理系统管理盘数据维护 - 数据导入 + * * @param fileName */ public void dataImport(String fileName) { //1 . 先清空数据 manageSysDiskDataMaintenanceMapper.deleteAll(); + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); //2 . 判断文件正确性 造数据 - if(fileName.equals("xxx.zip")){ + if (fileName.equals("xxx.zip")) { ManageSysDiskDataMaintenance param = new ManageSysDiskDataMaintenance(); param.setManagementDiskNumber("AAA000"); param.setCarrierModel("LS2"); param.setVersion(1); param.setDataLength(60); + param.setCreateTime(nowAsString); + param.setUpdateTime(nowAsString); manageSysDiskDataMaintenanceMapper.insertSelective(param); } } - - /** * 管理系统管理盘数据维护列表 */ @@ -61,16 +65,17 @@ public class SecretInstallService { } - - /** * 密钥装配 + * * @param type 装配类型 - * @param id 密钥体id + * @param id 密钥体id */ - public void secretInstall(Integer type,Integer id) { + public void secretInstall(Integer type, Integer id) { SecretImport secretImport = secretImportMapper.selectByPrimaryKey(id); - + LocalDateTime now = LocalDateTime.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String nowAsString = formatter.format(now); switch (type) { case 1: //管理密钥装配 @@ -89,11 +94,13 @@ public class SecretInstallService { managerSecretSetting.setEnterDate("20232211"); managerSecretSetting.setManagementFlag("协同管理标志"); managerSecretSetting.setAssemblySituation("装配情况"); + managerSecretSetting.setCreateTime(nowAsString); + managerSecretSetting.setUpdateTime(nowAsString); managerSecretSettingMapper.insertSelective(managerSecretSetting); break; case 2: //用户密钥装配 - + break; case 3: //专用密钥装配 @@ -104,7 +111,4 @@ public class SecretInstallService { } - - - } 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 8025458..a9ab164 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 @@ -3,9 +3,9 @@ package com.imitate.web.module.simulation.service; import com.alibaba.fastjson.JSONObject; import com.aliyuncs.utils.StringUtils; import com.imitate.common.util.SimpleFileUtils; +import com.imitate.web.module.simulation.enums.SecretKeyTypeEnum; import com.imitate.web.params.SecretKeyParam; import com.imitate.web.persistence.beans.SecretKey; -import com.imitate.web.module.simulation.enums.SecretKeyTypeEnum; import com.imitate.web.persistence.mapper.SecretKeyMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,86 +24,88 @@ import java.util.List; * @since 2022-07-14 */ @Service -public class SecretKeyService{ +public class SecretKeyService { @Autowired private SecretKeyMapper secretKeyMapper; - public String[] resourceSecretKey(List fileList){ + public String[] resourceSecretKey(List fileList) { //删除所有数据 secretKeyMapper.deleteAll(); - String[] msg = {"","","",""}; - for (int i = 0; i < fileList.size(); i++){ + String[] msg = {"", "", "", ""}; + for (int i = 0; i < fileList.size(); i++) { String f = fileList.get(i); - if (!StringUtils.isEmpty(f)){ + if (!StringUtils.isEmpty(f)) { try { File file = new File(f); String fileToString = SimpleFileUtils.fileToString(SimpleFileUtils.getMultipartFile(file)); SecretKey secretKey = JSONObject.parseObject(fileToString, SecretKey.class); - if (addEncryptionKeyList(secretKey,secretKey.getType())<0){ - msg[i] = f+"资源文件"+(i+1)+"内容格式错误！"; + if (addEncryptionKeyList(secretKey, secretKey.getType()) < 0) { + msg[i] = f + "资源文件" + (i + 1) + "内容格式错误！"; } - }catch (IllegalArgumentException e){ - msg[i] = f+"系统找不到指定的文件"+(i+1)+"!"; - }catch (Exception e){ - msg[i] = f+"资源文件"+(i+1)+"内容格式错误！"; + } catch (IllegalArgumentException e) { + msg[i] = f + "系统找不到指定的文件" + (i + 1) + "!"; + } catch (Exception e) { + msg[i] = f + "资源文件" + (i + 1) + "内容格式错误！"; } } } - fileList.forEach(f->{ + fileList.forEach(f -> { }); return msg; } - public int addEncryptionKeyList(SecretKey secretKey,String inType){ + 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())){ + if (!inType.equals(secretKey.getType())) { return -2; } - if (SecretKeyTypeEnum.PUBLIC_KEY.getValue().equals(secretKey.getType())){ + if (SecretKeyTypeEnum.PUBLIC_KEY.getValue().equals(secretKey.getType())) { //如果是公钥类型，必须有算法类型参数 - if (StringUtils.isEmpty(secretKey.getAlgorithm())){ + if (StringUtils.isEmpty(secretKey.getAlgorithm())) { return lc; } secretKey.setLength(null); lc = secretKeyMapper.updateByAlgorithmAndType(secretKey); - if (lc<=0){ + if (lc <= 0) { secretKey.setCreateTime(nowAsString); + secretKey.setUpdateTime(nowAsString); lc = secretKeyMapper.insertSelective(secretKey); } - }else { + } else { //如果是其他类型，必须有长度参数 - if (null == secretKey.getLength()){ + if (null == secretKey.getLength()) { return lc; } secretKey.setAlgorithm(null); lc = secretKeyMapper.updateByLengthAndType(secretKey); - if (lc<=0){ + if (lc <= 0) { secretKey.setCreateTime(nowAsString); + secretKey.setUpdateTime(nowAsString); lc = secretKeyMapper.insertSelective(secretKey); } } return lc; } - public List selectStatisticsByType(String type){ + public List selectStatisticsByType(String type) { return secretKeyMapper.selectStatisticsByType(type); } - public int pushByLengthAndType(SecretKey secretKey){ - if(SecretKeyTypeEnum.PUBLIC_KEY.getValue().equals(secretKey.getType())){ + public int pushByLengthAndType(SecretKey secretKey) { + if (SecretKeyTypeEnum.PUBLIC_KEY.getValue().equals(secretKey.getType())) { //如果是公钥类型，必须有算法类型参数 - if (StringUtils.isEmpty(secretKey.getAlgorithm())){ + if (StringUtils.isEmpty(secretKey.getAlgorithm())) { return -1; } secretKey.setLength(null); - }else{ + } else { //如果是其他类型，必须有长度参数 - if (null == secretKey.getLength()){ + if (null == secretKey.getLength()) { return -1; } secretKey.setAlgorithm(null); @@ -111,16 +113,16 @@ public class SecretKeyService{ return secretKeyMapper.pushByLengthAndType(secretKey); } - public String resourceEncryption(SecretKeyParam param){ + public String resourceEncryption(SecretKeyParam param) { SecretKey secretKey = param.getSecretKey(); - if(SecretKeyTypeEnum.PUBLIC_KEY.getValue().equals(secretKey.getType())){ + if (SecretKeyTypeEnum.PUBLIC_KEY.getValue().equals(secretKey.getType())) { //如果是公钥类型，必须有算法类型参数 - if (StringUtils.isEmpty(secretKey.getAlgorithm())){ + if (StringUtils.isEmpty(secretKey.getAlgorithm())) { return ""; } - }else{ + } else { //如果是其他类型，必须有长度参数 - if (null == secretKey.getLength()){ + if (null == secretKey.getLength()) { return ""; } } diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/UpholdAlgorithmInfoService.java b/web/src/main/java/com/imitate/web/module/simulation/service/UpholdAlgorithmInfoService.java index 9c2511f..474d653 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/UpholdAlgorithmInfoService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/UpholdAlgorithmInfoService.java @@ -27,30 +27,31 @@ public class UpholdAlgorithmInfoService { @Autowired private UpholdAlgorithmInfoMapper upholdAlgorithmInfoMapper; - public UpholdAlgorithmInfo getById(Long id){ + public UpholdAlgorithmInfo getById(Long id) { return upholdAlgorithmInfoMapper.selectByPrimaryKey(id); } - public int updateOrAdd(UpholdAlgorithmInfo entity){ + public int updateOrAdd(UpholdAlgorithmInfo entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return upholdAlgorithmInfoMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return upholdAlgorithmInfoMapper.updateByPrimaryKeySelective(entity); } } - public int delOrRestoreByIds(List ids, Integer delStatus){ - if (CollectionUtils.isEmpty(ids) || !DelFlagEnum.getValueList().contains(delStatus)){ + public int delOrRestoreByIds(List ids, Integer delStatus) { + if (CollectionUtils.isEmpty(ids) || !DelFlagEnum.getValueList().contains(delStatus)) { return 0; } return upholdAlgorithmInfoMapper.delOrRestoreByIds(ids, delStatus); } - public PageInfo pageList(UpholdAlgorithmInfoListParam param){ + public PageInfo pageList(UpholdAlgorithmInfoListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = upholdAlgorithmInfoMapper.selectAllByParam(param); return new PageInfo<>(list); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/UpholdArgsInfoService.java b/web/src/main/java/com/imitate/web/module/simulation/service/UpholdArgsInfoService.java index 9347005..e8c3ea7 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/UpholdArgsInfoService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/UpholdArgsInfoService.java @@ -27,30 +27,31 @@ public class UpholdArgsInfoService { @Autowired private UpholdArgsInfoMapper upholdArgsInfoMapper; - public UpholdArgsInfo getById(Long id){ + public UpholdArgsInfo getById(Long id) { return upholdArgsInfoMapper.selectByPrimaryKey(id); } - public int updateOrAdd(UpholdArgsInfo entity){ + public int updateOrAdd(UpholdArgsInfo entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return upholdArgsInfoMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return upholdArgsInfoMapper.updateByPrimaryKeySelective(entity); } } - public int delOrRestoreByIds(List ids, Integer delStatus){ - if (CollectionUtils.isEmpty(ids) || !DelFlagEnum.getValueList().contains(delStatus)){ + public int delOrRestoreByIds(List ids, Integer delStatus) { + if (CollectionUtils.isEmpty(ids) || !DelFlagEnum.getValueList().contains(delStatus)) { return 0; } return upholdArgsInfoMapper.delOrRestoreByIds(ids, delStatus); } - public PageInfo pageList(UpholdArgsInfoListParam param){ + public PageInfo pageList(UpholdArgsInfoListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = upholdArgsInfoMapper.selectAllByParam(param); return new PageInfo<>(list); diff --git a/web/src/main/java/com/imitate/web/module/simulation/service/UpholdManagerSystemService.java b/web/src/main/java/com/imitate/web/module/simulation/service/UpholdManagerSystemService.java index fbcf5cc..e23fa90 100644 --- a/web/src/main/java/com/imitate/web/module/simulation/service/UpholdManagerSystemService.java +++ b/web/src/main/java/com/imitate/web/module/simulation/service/UpholdManagerSystemService.java @@ -26,26 +26,27 @@ public class UpholdManagerSystemService { @Autowired private UpholdManagerSystemMapper upholdManagerSystemMapper; - public UpholdManagerSystem getById(Long id){ + public UpholdManagerSystem getById(Long id) { return upholdManagerSystemMapper.selectByPrimaryKey(id); } - public int updateOrAdd(UpholdManagerSystem entity){ + public int updateOrAdd(UpholdManagerSystem entity) { String nowStr = LocalDateTime.now().format(DateConfig.DATE_TIME_FORMATTER); - if (entity.getId() == null){ + if (entity.getId() == null) { entity.setCreateTime(nowStr); + entity.setUpdateTime(nowStr); return upholdManagerSystemMapper.insertSelective(entity); - }else { + } else { entity.setUpdateTime(nowStr); return upholdManagerSystemMapper.updateByPrimaryKeySelective(entity); } } - public int delById(Long id){ + public int delById(Long id) { return upholdManagerSystemMapper.deleteByPrimaryKey(id); } - public PageInfo pageList(UpholdManagerSystemListParam param){ + public PageInfo pageList(UpholdManagerSystemListParam param) { PageHelper.startPage(param.getPageNumber(), param.getPageSize()); List list = upholdManagerSystemMapper.selectAllByParam(param); return new PageInfo<>(list); diff --git a/web/src/main/java/com/imitate/web/persistence/beans/SecretIssueSubordinate.java b/web/src/main/java/com/imitate/web/persistence/beans/SecretIssueSubordinate.java index 2d3730d..3bad6ab 100644 --- a/web/src/main/java/com/imitate/web/persistence/beans/SecretIssueSubordinate.java +++ b/web/src/main/java/com/imitate/web/persistence/beans/SecretIssueSubordinate.java @@ -1,21 +1,18 @@ package com.imitate.web.persistence.beans; -import java.time.LocalDateTime; -import java.util.Date; - -import javax.persistence.Table; - import com.imitate.common.util.AbstractDO; - import lombok.Data; import lombok.EqualsAndHashCode; +import javax.persistence.Table; +import java.time.LocalDateTime; + @Data @EqualsAndHashCode(callSuper = false) @Table(name = "secret_issue_subordinate") public class SecretIssueSubordinate extends AbstractDO { - + private String issueType; private String productName; @@ -44,7 +41,7 @@ public class SecretIssueSubordinate extends AbstractDO { private Integer quantity; - private LocalDateTime quantityTime; + private String quantityTime; private String distCode; diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties index 7f69ed4..0afa0ed 100644 --- a/web/src/main/resources/application.properties +++ b/web/src/main/resources/application.properties @@ -1,15 +1,11 @@ server.port=8088 -server.servlet.context-path=/xgd +server.servlet.context-path=/ server.max-http-header-size=8192 server.compression.enabled=true server.compression.min-response-size=1024 server.compression.mime-types=text/plain,text/css,text/xml,text/javascript,application/json,application/javascript,application/xml,application/xml+rss,application/x-javascript,application/x-httpd-php,image/jpeg,image/gif,image/png server.tomcat.uri-encoding=UTF-8 - - - spring.config.import=classpath:common.properties - spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.initialSize=200 spring.datasource.maxActive=400 @@ -21,30 +17,23 @@ spring.datasource.testWhileIdle=true mybatis.type-aliases-package=com.imitate.web.persistence.beans mybatis.mapperLocations=classpath*:mybatis/*.xml mybatis.configuration.map-underscore-to-camel-case=true - # SQLite spring.datasource.driver-class-name=org.sqlite.JDBC -spring.datasource.url=jdbc:sqlite::resource:db/sqlite3.db - +spring.datasource.url=jdbc:sqlite::resource:db/sqlite3.db?date_string_format=yyyy-MM-dd HH:mm:ss #xgd init imitate.init.path=/data/workspace/platform/eva/datacenter #imitate.init.path=C:\\xgd imitate.init.xml=xgdImitateInit.xml imitate.init.xlsx=xgdImitateInit.xlsx - #mapper mapper.mappers=com.imitate.common.util.BaseMapper mapper.not-empty=false mapper.identity=MYSQL - - # pagehelper pagehelper.helper-dialect=mysql pagehelper.reasonable=true pagehelper.support-methods-arguments=true pagehelper.params=count=countSql - - #showSql logging.level.com.imitate.web.persistence.mapper=debug