diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 2287758..4d49c9e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -1,8 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; import com.casic.missiles.modular.system.model.AddressConfig; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * IP配置控制器 @@ -43,6 +46,17 @@ } /** + * 获取历史通信地址 + */ + @GetMapping(value = "/historyAddress") + @ResponseBody + public Object historyAddress(String name) { + Assert.isFalse(name == null || "".equals(name), () -> new RequestValidException("name不能为空")); + List> mapList = configService.selectAddressByName(name); + return ResponseData.success(mapList); + } + + /** * 设置IP */ @PostMapping(value = "/update") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 2287758..4d49c9e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -1,8 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; import com.casic.missiles.modular.system.model.AddressConfig; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * IP配置控制器 @@ -43,6 +46,17 @@ } /** + * 获取历史通信地址 + */ + @GetMapping(value = "/historyAddress") + @ResponseBody + public Object historyAddress(String name) { + Assert.isFalse(name == null || "".equals(name), () -> new RequestValidException("name不能为空")); + List> mapList = configService.selectAddressByName(name); + return ResponseData.success(mapList); + } + + /** * 设置IP */ @PostMapping(value = "/update") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java index d03486b..e6e7b59 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.SysConfig; /** * @author a203 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 2287758..4d49c9e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -1,8 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; import com.casic.missiles.modular.system.model.AddressConfig; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * IP配置控制器 @@ -43,6 +46,17 @@ } /** + * 获取历史通信地址 + */ + @GetMapping(value = "/historyAddress") + @ResponseBody + public Object historyAddress(String name) { + Assert.isFalse(name == null || "".equals(name), () -> new RequestValidException("name不能为空")); + List> mapList = configService.selectAddressByName(name); + return ResponseData.success(mapList); + } + + /** * 设置IP */ @PostMapping(value = "/update") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java index d03486b..e6e7b59 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.SysConfig; /** * @author a203 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java index 508e166..be84cb9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java @@ -4,6 +4,9 @@ import com.casic.missiles.modular.system.dto.AddressConfigDTO; import com.casic.missiles.modular.system.model.AddressConfig; +import java.util.List; +import java.util.Map; + /** * @author a203 */ @@ -14,4 +17,12 @@ * @return {@link AddressConfigDTO} */ AddressConfigDTO selectLastConfig(); + + /** + * 根据名字查询所有的历史配置记录 + * + * @param name + * @return {@link List} + */ + List> selectAddressByName(String name); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java index 2287758..4d49c9e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/controller/SystemConfigController.java @@ -1,8 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dto.AddressConfigDTO; import com.casic.missiles.modular.system.model.AddressConfig; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * IP配置控制器 @@ -43,6 +46,17 @@ } /** + * 获取历史通信地址 + */ + @GetMapping(value = "/historyAddress") + @ResponseBody + public Object historyAddress(String name) { + Assert.isFalse(name == null || "".equals(name), () -> new RequestValidException("name不能为空")); + List> mapList = configService.selectAddressByName(name); + return ResponseData.success(mapList); + } + + /** * 设置IP */ @PostMapping(value = "/update") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java index d03486b..e6e7b59 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dao/AddressConfigMapper.java @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AddressConfig; -import com.casic.missiles.modular.system.model.SysConfig; /** * @author a203 diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java index 508e166..be84cb9 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IAddressConfigService.java @@ -4,6 +4,9 @@ import com.casic.missiles.modular.system.dto.AddressConfigDTO; import com.casic.missiles.modular.system.model.AddressConfig; +import java.util.List; +import java.util.Map; + /** * @author a203 */ @@ -14,4 +17,12 @@ * @return {@link AddressConfigDTO} */ AddressConfigDTO selectLastConfig(); + + /** + * 根据名字查询所有的历史配置记录 + * + * @param name + * @return {@link List} + */ + List> selectAddressByName(String name); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/AddressConfigServiceImpl.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/AddressConfigServiceImpl.java index d385d00..b50f90f 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/AddressConfigServiceImpl.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/impl/AddressConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.AddressConfigMapper; import com.casic.missiles.modular.system.dto.AddressConfigDTO; @@ -7,6 +8,11 @@ import com.casic.missiles.modular.system.service.IAddressConfigService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * IP配置信息 服务实现类 * @@ -27,4 +33,53 @@ } return new AddressConfigDTO(config); } + + @Override + public List> selectAddressByName(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByDesc("UPDATE_TIME"); + List addressConfigs = this.baseMapper.selectList(queryWrapper); + List> mapList = new ArrayList<>(); + switch (name) { + case "aisIp": + for (AddressConfig config : addressConfigs) { + Map configMap = new HashMap<>(3); + configMap.put("id", config.getId()); + configMap.put("ip", config.getAisIp()); + configMap.put("updateTime", config.getUpdateTime()); + mapList.add(configMap); + } + break; + case "envIp": + for (AddressConfig config : addressConfigs) { + Map configMap = new HashMap<>(3); + configMap.put("id", config.getId()); + configMap.put("ip", config.getEnvIp()); + configMap.put("updateTime", config.getUpdateTime()); + mapList.add(configMap); + } + break; + case "shelterIp": + for (AddressConfig config : addressConfigs) { + Map configMap = new HashMap<>(3); + configMap.put("id", config.getId()); + configMap.put("ip", config.getShelterIp()); + configMap.put("updateTime", config.getUpdateTime()); + mapList.add(configMap); + } + break; + case "robotIp": + for (AddressConfig config : addressConfigs) { + Map configMap = new HashMap<>(3); + configMap.put("id", config.getId()); + configMap.put("ip", config.getRobotIp()); + configMap.put("updateTime", config.getUpdateTime()); + mapList.add(configMap); + } + break; + default: + break; + } + return mapList; + } }