From b6ff674d0bc2ade63af9bb81348988c632074e84 Mon Sep 17 00:00:00 2001 From: liulu Date: Tue, 29 Oct 2024 15:56:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E9=92=A5=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chsm/controller/CryptoServiceController.java | 8 ++++---- .../chsm/controller/DeviceController.java | 12 ++++++------ .../chsm/controller/DeviceGroupController.java | 8 ++++---- .../chsm/controller/KeyInfoAsymController.java | 4 ++-- .../chsm/controller/KeyInfoController.java | 4 ++-- .../chsm/controller/KeyInfoSymController.java | 4 ++-- .../chsm/controller/KeyTemplateController.java | 8 ++++---- .../com/sunyard/chsm/dto/CryptoServiceDTO.java | 4 ++-- .../java/com/sunyard/chsm/dto/DeviceDTO.java | 9 ++++----- .../com/sunyard/chsm/dto/DeviceGroupDTO.java | 4 ++-- .../java/com/sunyard/chsm/dto/KeyInfoDTO.java | 6 +++--- .../com/sunyard/chsm/dto/KeyTemplateDTO.java | 4 ++-- .../chsm/service/CryptoServiceService.java | 6 +++--- .../sunyard/chsm/service/DeviceGroupService.java | 6 +++--- .../com/sunyard/chsm/service/DeviceService.java | 8 ++++---- .../com/sunyard/chsm/service/KeyInfoService.java | 6 +++--- .../sunyard/chsm/service/KeyTemplateService.java | 6 +++--- .../service/impl/CryptoServiceServiceImpl.java | 12 ++++++------ .../service/impl/DeviceGroupServiceImpl.java | 12 ++++++------ .../chsm/service/impl/DeviceServiceImpl.java | 16 ++++++++-------- .../chsm/service/impl/KeyInfoServiceImpl.java | 12 ++++++------ .../service/impl/KeyTemplateServiceImpl.java | 16 ++++++++-------- pom.xml | 11 ----------- 23 files changed, 87 insertions(+), 99 deletions(-) diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/CryptoServiceController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/CryptoServiceController.java index 36d85ae..cad09c6 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/CryptoServiceController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/CryptoServiceController.java @@ -72,9 +72,9 @@ public class CryptoServiceController { * @return 密码服务列表 */ @GetMapping("/pageList") - public R> servicePageList(CryptoServiceDTO.Query query) { + public R> servicePageList(CryptoServiceDTO.Query query) { - Page page = cryptoServiceService.selectPageList(query); + Page page = cryptoServiceService.selectPageList(query); return R.data(page); } @@ -86,7 +86,7 @@ public class CryptoServiceController { * @return 密码服务id */ @PostMapping - public R saveService(@Valid @RequestBody CryptoServiceDTO.Save save) { + public R saveService(@Valid @RequestBody CryptoServiceDTO.CSSave save) { Long id = cryptoServiceService.save(save); return R.data(String.valueOf(id)); } @@ -98,7 +98,7 @@ public class CryptoServiceController { * @return 密码服务id */ @PutMapping - public R updateService(@Valid @RequestBody CryptoServiceDTO.Save update) { + public R updateService(@Valid @RequestBody CryptoServiceDTO.CSSave update) { Assert.notNull(update.getId(), "密码服务id不能为空"); cryptoServiceService.update(update); return R.ok(); diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceController.java index 8aa5304..f201db2 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceController.java @@ -42,9 +42,9 @@ public class DeviceController { * @return 分页列表 */ @GetMapping("/pageList") - public R> servicePageList(DeviceDTO.Query query) { + public R> servicePageList(DeviceDTO.Query query) { - Page page = deviceService.selectPageList(query); + Page page = deviceService.selectPageList(query); return R.data(page); } @@ -55,9 +55,9 @@ public class DeviceController { * @return 列表 */ @GetMapping("/ungrouped/list") - public R> getUngroupedList() { + public R> getUngroupedList() { - List res = deviceService.getUngroupedList(); + List res = deviceService.getUngroupedList(); return R.data(res); } @@ -111,7 +111,7 @@ public class DeviceController { * @return id */ @PostMapping - public R save(@Valid @RequestBody DeviceDTO.Save save) { + public R save(@Valid @RequestBody DeviceDTO.DeviceSave save) { Long id = deviceService.save(save); return R.data(String.valueOf(id)); } @@ -123,7 +123,7 @@ public class DeviceController { * @return void */ @PutMapping - public R update(@Valid @RequestBody DeviceDTO.Save update) { + public R update(@Valid @RequestBody DeviceDTO.DeviceSave update) { deviceService.update(update); return R.ok(); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceGroupController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceGroupController.java index 2b8a946..a86c608 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceGroupController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/DeviceGroupController.java @@ -35,9 +35,9 @@ public class DeviceGroupController { * @return 分页列表 */ @GetMapping("/pageList") - public R> servicePageList(DeviceGroupDTO.Query query) { + public R> servicePageList(DeviceGroupDTO.Query query) { - Page page = deviceGroupService.selectPageList(query); + Page page = deviceGroupService.selectPageList(query); return R.data(page); } @@ -49,7 +49,7 @@ public class DeviceGroupController { * @return id */ @PostMapping - public R save(@Valid @RequestBody DeviceGroupDTO.Save save) { + public R save(@Valid @RequestBody DeviceGroupDTO.DGSave save) { Long id = deviceGroupService.save(save); return R.data(String.valueOf(id)); } @@ -61,7 +61,7 @@ public class DeviceGroupController { * @return void */ @PutMapping - public R update(@Valid @RequestBody DeviceGroupDTO.Save update) { + public R update(@Valid @RequestBody DeviceGroupDTO.DGSave update) { deviceGroupService.update(update); return R.ok(); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java index 9e89698..8def252 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoAsymController.java @@ -39,9 +39,9 @@ public class KeyInfoAsymController { * @return 分页列表 */ @GetMapping("/pageList") - public R> aymPageList(KeyInfoDTO.Query query) { + public R> aymPageList(KeyInfoDTO.Query query) { query.setKeyType(KeyCategory.ASYM_KEY.getCode()); - Page page = keyInfoService.selectPageList(query); + Page page = keyInfoService.selectPageList(query); return R.data(page); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java index b4b4ab0..331dbe5 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java @@ -52,7 +52,7 @@ public class KeyInfoController { * @return id */ @PostMapping("/create") - public R save(@Valid @RequestBody KeyInfoDTO.Save save) { + public R save(@Valid @RequestBody KeyInfoDTO.KeySave save) { Long id = keyInfoService.save(save); return R.data(String.valueOf(id)); } @@ -64,7 +64,7 @@ public class KeyInfoController { * @return id */ @PostMapping("/update") - public R save(@Valid @RequestBody KeyInfoDTO.Update update) { + public R save(@Valid @RequestBody KeyInfoDTO.KeyUpdate update) { keyInfoService.update(update); return R.ok(); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoSymController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoSymController.java index f4af457..0c5db97 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoSymController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoSymController.java @@ -41,9 +41,9 @@ public class KeyInfoSymController { * @return 分页列表 */ @GetMapping("/pageList") - public R> symPageList(KeyInfoDTO.Query query) { + public R> symPageList(KeyInfoDTO.Query query) { query.setKeyType(KeyCategory.SYM_KEY.getCode()); - Page page = keyInfoService.selectPageList(query); + Page page = keyInfoService.selectPageList(query); return R.data(page); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyTemplateController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyTemplateController.java index c3ee669..972ab2c 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyTemplateController.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyTemplateController.java @@ -34,9 +34,9 @@ public class KeyTemplateController { * @return 分页列表 */ @GetMapping("/pageList") - public R> servicePageList(KeyTemplateDTO.Query query) { + public R> servicePageList(KeyTemplateDTO.Query query) { - Page page = keyTemplateService.selectPageList(query); + Page page = keyTemplateService.selectPageList(query); return R.data(page); } @@ -48,7 +48,7 @@ public class KeyTemplateController { * @return id */ @PostMapping - public R save(@Valid @RequestBody KeyTemplateDTO.Save save) { + public R save(@Valid @RequestBody KeyTemplateDTO.KTSave save) { Long id = keyTemplateService.save(save); return R.data(String.valueOf(id)); } @@ -60,7 +60,7 @@ public class KeyTemplateController { * @return void */ @PutMapping - public R update(@Valid @RequestBody KeyTemplateDTO.Save update) { + public R update(@Valid @RequestBody KeyTemplateDTO.KTSave update) { keyTemplateService.update(update); return R.ok(); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/CryptoServiceDTO.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/CryptoServiceDTO.java index 0fe1e86..3745d2b 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/CryptoServiceDTO.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/CryptoServiceDTO.java @@ -26,7 +26,7 @@ public abstract class CryptoServiceDTO { } @Data - public static class Save { + public static class CSSave { /** * 密码服务Id */ @@ -54,7 +54,7 @@ public abstract class CryptoServiceDTO { } @Data - public static class View { + public static class CSView { /** * 密码服务Id diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceDTO.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceDTO.java index 9180d73..e80dd4f 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceDTO.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceDTO.java @@ -36,7 +36,7 @@ public abstract class DeviceDTO { } @Data - public static class Save { + public static class DeviceSave { private Long id; /** @@ -58,7 +58,7 @@ public abstract class DeviceDTO { * 服务ip */ @NotBlank(message = "服务ip不能为空") - @Pattern(regexp = RegexConstant.DEVICE_IPV4, message = "ip格式错误") + @Pattern(regexp = RegexConstant.DEVICE_IPV4, message = "服务ip格式错误") private String serviceIp; /** * 服务端口 @@ -68,7 +68,6 @@ public abstract class DeviceDTO { /** * 管理ip */ - @Pattern(regexp = RegexConstant.DEVICE_IPV4, message = "ip格式错误") private String manageIp; /** * 管理端口 @@ -87,7 +86,7 @@ public abstract class DeviceDTO { } @Data - public static class View { + public static class DeviceView { private Long id; /** * 名称 @@ -132,7 +131,7 @@ public abstract class DeviceDTO { @EqualsAndHashCode(callSuper = true) @Data - public static class Detail extends View { + public static class Detail extends DeviceView { private Double cpuRate; private Double memoryRate; diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceGroupDTO.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceGroupDTO.java index b6e5ef5..2158d30 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceGroupDTO.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/DeviceGroupDTO.java @@ -24,7 +24,7 @@ public abstract class DeviceGroupDTO { } @Data - public static class View { + public static class DGView { private Long id; /** @@ -45,7 +45,7 @@ public abstract class DeviceGroupDTO { @Data - public static class Save { + public static class DGSave { private Long id; /** * 设备组名称 diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyInfoDTO.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyInfoDTO.java index 54792cf..5488025 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyInfoDTO.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyInfoDTO.java @@ -25,7 +25,7 @@ public abstract class KeyInfoDTO { } @Data - public static class Save { + public static class KeySave { private Long applicationId; /** @@ -42,7 +42,7 @@ public abstract class KeyInfoDTO { } @Data - public static class View { + public static class KeyView { private Long id; /** * KEY_ID @@ -87,7 +87,7 @@ public abstract class KeyInfoDTO { } @Data - public static class Update { + public static class KeyUpdate { /** * 密钥id列表 */ diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyTemplateDTO.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyTemplateDTO.java index 4a013d6..e9ef875 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyTemplateDTO.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/KeyTemplateDTO.java @@ -27,7 +27,7 @@ public abstract class KeyTemplateDTO { } @Data - public static class View { + public static class KTView { private Long id; private String code; private String name; @@ -49,7 +49,7 @@ public abstract class KeyTemplateDTO { @Data - public static class Save { + public static class KTSave { private Long id; /** * 模版编号 diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/CryptoServiceService.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/CryptoServiceService.java index cb5b5f2..97fea57 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/CryptoServiceService.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/CryptoServiceService.java @@ -10,11 +10,11 @@ import com.sunyard.chsm.dto.CryptoServiceDTO; public interface CryptoServiceService { - Page selectPageList(CryptoServiceDTO.Query query); + Page selectPageList(CryptoServiceDTO.Query query); - Long save(CryptoServiceDTO.Save save); + Long save(CryptoServiceDTO.CSSave save); - void update(CryptoServiceDTO.Save update); + void update(CryptoServiceDTO.CSSave update); void delete(Long id); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceGroupService.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceGroupService.java index f5c21f2..e206cb1 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceGroupService.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceGroupService.java @@ -9,11 +9,11 @@ import com.sunyard.chsm.dto.DeviceGroupDTO; */ public interface DeviceGroupService { - Page selectPageList(DeviceGroupDTO.Query query); + Page selectPageList(DeviceGroupDTO.Query query); - Long save(DeviceGroupDTO.Save save); + Long save(DeviceGroupDTO.DGSave save); - void update(DeviceGroupDTO.Save update); + void update(DeviceGroupDTO.DGSave update); void delete(Long id); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceService.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceService.java index 7a83f57..b0206f1 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceService.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/DeviceService.java @@ -10,15 +10,15 @@ import java.util.List; * @since 2024/10/17 */ public interface DeviceService { - Page selectPageList(DeviceDTO.Query query); + Page selectPageList(DeviceDTO.Query query); - List getUngroupedList(); + List getUngroupedList(); DeviceDTO.Detail getDetailById(Long id); - Long save(DeviceDTO.Save save); + Long save(DeviceDTO.DeviceSave save); - void update(DeviceDTO.Save update); + void update(DeviceDTO.DeviceSave update); void delete(Long id); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyInfoService.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyInfoService.java index 1e6233b..c47fbd5 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyInfoService.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyInfoService.java @@ -12,11 +12,11 @@ import java.util.List; */ public interface KeyInfoService { - Page selectPageList(KeyInfoDTO.Query query); + Page selectPageList(KeyInfoDTO.Query query); - Long save(KeyInfoDTO.Save save); + Long save(KeyInfoDTO.KeySave save); - void update(KeyInfoDTO.Update update); + void update(KeyInfoDTO.KeyUpdate update); byte[] backupKey(KeyInfoDTO.Backup backup); diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyTemplateService.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyTemplateService.java index f8b5bf2..e54b54a 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyTemplateService.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/KeyTemplateService.java @@ -9,11 +9,11 @@ import com.sunyard.chsm.dto.KeyTemplateDTO; */ public interface KeyTemplateService { - Page selectPageList(KeyTemplateDTO.Query query); + Page selectPageList(KeyTemplateDTO.Query query); - Long save(KeyTemplateDTO.Save save); + Long save(KeyTemplateDTO.KTSave save); - void update(KeyTemplateDTO.Save update); + void update(KeyTemplateDTO.KTSave update); void delete(Long id); } diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/CryptoServiceServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/CryptoServiceServiceImpl.java index 616b56e..106dc74 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/CryptoServiceServiceImpl.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/CryptoServiceServiceImpl.java @@ -49,7 +49,7 @@ public class CryptoServiceServiceImpl implements CryptoServiceService { private SpDeviceGroupMapper spDeviceGroupMapper; @Override - public Page selectPageList(CryptoServiceDTO.Query query) { + public Page selectPageList(CryptoServiceDTO.Query query) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(StringUtils.hasText(query.getName()), CryptoService::getName, query.getName()) @@ -73,9 +73,9 @@ public class CryptoServiceServiceImpl implements CryptoServiceService { .collect(Collectors.groupingBy(CryptoServiceApi::getCryptoServiceId)); - List viewList = records.stream() + List viewList = records.stream() .map(it -> { - CryptoServiceDTO.View view = new CryptoServiceDTO.View(); + CryptoServiceDTO.CSView view = new CryptoServiceDTO.CSView(); BeanUtils.copyProperties(it, view); Optional.ofNullable(EnableStatus.of(it.getStatus())) .map(EnableStatus::getDesc) @@ -96,13 +96,13 @@ public class CryptoServiceServiceImpl implements CryptoServiceService { }) .collect(Collectors.toList()); - return new Page(servicePage.getCurrent(), + return new Page(servicePage.getCurrent(), servicePage.getSize(), servicePage.getTotal()).setRecords(viewList); } @Transactional @Override - public Long save(CryptoServiceDTO.Save save) { + public Long save(CryptoServiceDTO.CSSave save) { checkName(save.getName()); @@ -127,7 +127,7 @@ public class CryptoServiceServiceImpl implements CryptoServiceService { @Transactional @Override - public void update(CryptoServiceDTO.Save update) { + public void update(CryptoServiceDTO.CSSave update) { CryptoService exist = cryptoServiceMapper.selectById(update.getId()); Assert.notNull(exist, "密码服务不存在"); if (!Objects.equals(update.getName(), exist.getName())) { diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceGroupServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceGroupServiceImpl.java index 82791af..5701f36 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceGroupServiceImpl.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceGroupServiceImpl.java @@ -41,7 +41,7 @@ public class DeviceGroupServiceImpl implements DeviceGroupService { @Override - public Page selectPageList(DeviceGroupDTO.Query query) { + public Page selectPageList(DeviceGroupDTO.Query query) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(StringUtils.hasText(query.getName()), DeviceGroup::getName, query.getName()) @@ -61,9 +61,9 @@ public class DeviceGroupServiceImpl implements DeviceGroupService { .in(Device::getGroupId, ids) ).stream().collect(Collectors.groupingBy(Device::getGroupId)); - List viewList = records.stream() + List viewList = records.stream() .map(it -> { - DeviceGroupDTO.View view = new DeviceGroupDTO.View(); + DeviceGroupDTO.DGView view = new DeviceGroupDTO.DGView(); BeanUtils.copyProperties(it, view); Map deviceNames = groupMap.getOrDefault(it.getId(), Collections.emptyList()) @@ -75,13 +75,13 @@ public class DeviceGroupServiceImpl implements DeviceGroupService { }) .collect(Collectors.toList()); - return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); + return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); } @Transactional @Override - public Long save(DeviceGroupDTO.Save save) { + public Long save(DeviceGroupDTO.DGSave save) { checkName(save.getName()); @@ -110,7 +110,7 @@ public class DeviceGroupServiceImpl implements DeviceGroupService { @Transactional @Override - public void update(DeviceGroupDTO.Save update) { + public void update(DeviceGroupDTO.DGSave update) { Assert.notNull(update.getId(), "id不能为空"); DeviceGroup exist = spDeviceGroupMapper.selectById(update.getId()); Assert.notNull(exist, "id对应的设备组不存在"); diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceServiceImpl.java index c25717b..46c999f 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceServiceImpl.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/DeviceServiceImpl.java @@ -37,7 +37,7 @@ public class DeviceServiceImpl implements DeviceService { private SpDeviceMapper spDeviceMapper; @Override - public Page selectPageList(DeviceDTO.Query query) { + public Page selectPageList(DeviceDTO.Query query) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(StringUtils.hasText(query.getManufacturers()), Device::getManufacturer, query.getManufacturers()) .eq(StringUtils.hasText(query.getModel()), Device::getManufacturerModel, query.getModel()) @@ -51,9 +51,9 @@ public class DeviceServiceImpl implements DeviceService { if (CollectionUtils.isEmpty(records)) { return new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); } - List viewList = records.stream() + List viewList = records.stream() .map(it -> { - DeviceDTO.View view = new DeviceDTO.View(); + DeviceDTO.DeviceView view = new DeviceDTO.DeviceView(); BeanUtils.copyProperties(it, view); Optional.ofNullable(ManufacturerEnum.of(it.getManufacturer())) .map(ManufacturerEnum::getName) @@ -65,18 +65,18 @@ public class DeviceServiceImpl implements DeviceService { }) .collect(Collectors.toList()); - return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); + return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); } @Override - public List getUngroupedList() { + public List getUngroupedList() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(Device::getGroupId, 0L); List devices = spDeviceMapper.selectList(wrapper); return devices.stream() .map(it -> { - DeviceDTO.View view = new DeviceDTO.View(); + DeviceDTO.DeviceView view = new DeviceDTO.DeviceView(); BeanUtils.copyProperties(it, view); Optional.ofNullable(ManufacturerEnum.of(it.getManufacturer())) .map(ManufacturerEnum::getName) @@ -114,7 +114,7 @@ public class DeviceServiceImpl implements DeviceService { @Transactional @Override - public Long save(DeviceDTO.Save save) { + public Long save(DeviceDTO.DeviceSave save) { ManufacturerEnum manufacturer = ManufacturerEnum.of(save.getManufacturer()); Assert.notNull(manufacturer, "不支持的设备厂商: " + save.getManufacturer()); ManufacturerModelEnum manufacturerModel = ManufacturerModelEnum.of(save.getManufacturerModel()); @@ -137,7 +137,7 @@ public class DeviceServiceImpl implements DeviceService { @Transactional @Override - public void update(DeviceDTO.Save update) { + public void update(DeviceDTO.DeviceSave update) { Assert.notNull(update.getId(), "id不能为空"); Device exist = spDeviceMapper.selectById(update.getId()); Assert.notNull(exist, "id对应的设备不存在"); diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java index ea433c9..5f82d17 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java @@ -66,7 +66,7 @@ public class KeyInfoServiceImpl implements KeyInfoService { @Override - public Page selectPageList(KeyInfoDTO.Query query) { + public Page selectPageList(KeyInfoDTO.Query query) { IPage page = keyInfoMapper.selectPage( new Page<>(query.getPageNumber(), query.getPageSize()), @@ -79,9 +79,9 @@ public class KeyInfoServiceImpl implements KeyInfoService { if (CollectionUtils.isEmpty(records)) { return new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); } - List viewList = records.stream() + List viewList = records.stream() .map(it -> { - KeyInfoDTO.View view = new KeyInfoDTO.View(); + KeyInfoDTO.KeyView view = new KeyInfoDTO.KeyView(); BeanUtils.copyProperties(it, view); Optional.ofNullable(KeyCategory.of(it.getKeyType())) .map(KeyCategory::getDesc) @@ -99,12 +99,12 @@ public class KeyInfoServiceImpl implements KeyInfoService { }) .collect(Collectors.toList()); - return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); + return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); } @Transactional @Override - public Long save(KeyInfoDTO.Save save) { + public Long save(KeyInfoDTO.KeySave save) { KeyTemplate keyTemplate = keyTemplateMapper.selectOne( new LambdaQueryWrapper() @@ -149,7 +149,7 @@ public class KeyInfoServiceImpl implements KeyInfoService { @Transactional @Override - public void update(KeyInfoDTO.Update update) { + public void update(KeyInfoDTO.KeyUpdate update) { List ids = update.getIds(); if (CollectionUtils.isEmpty(ids)) { return; diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyTemplateServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyTemplateServiceImpl.java index bd0d3c3..5c0851e 100644 --- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyTemplateServiceImpl.java +++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyTemplateServiceImpl.java @@ -41,7 +41,7 @@ public class KeyTemplateServiceImpl implements KeyTemplateService { @Override - public Page selectPageList(KeyTemplateDTO.Query query) { + public Page selectPageList(KeyTemplateDTO.Query query) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .eq(StringUtils.hasText(query.getKeyType()), KeyTemplate::getKeyType, query.getKeyType()) .orderByDesc(KeyTemplate::getCreateTime); @@ -53,9 +53,9 @@ public class KeyTemplateServiceImpl implements KeyTemplateService { if (CollectionUtils.isEmpty(records)) { return new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); } - List viewList = records.stream() + List viewList = records.stream() .map(it -> { - KeyTemplateDTO.View view = new KeyTemplateDTO.View(); + KeyTemplateDTO.KTView view = new KeyTemplateDTO.KTView(); BeanUtils.copyProperties(it, view); Optional.ofNullable(KeyCategory.of(it.getKeyType())) .map(KeyCategory::getDesc) @@ -69,12 +69,12 @@ public class KeyTemplateServiceImpl implements KeyTemplateService { }) .collect(Collectors.toList()); - return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); + return new Page(page.getCurrent(), page.getSize(), page.getTotal()).setRecords(viewList); } @Override - public Long save(KeyTemplateDTO.Save save) { + public Long save(KeyTemplateDTO.KTSave save) { checkEnum(save); checkCode(save.getCode()); @@ -89,7 +89,7 @@ public class KeyTemplateServiceImpl implements KeyTemplateService { } @Override - public void update(KeyTemplateDTO.Save update) { + public void update(KeyTemplateDTO.KTSave update) { Assert.notNull(update.getId(), "id不能为空"); checkEnum(update); @@ -116,7 +116,7 @@ public class KeyTemplateServiceImpl implements KeyTemplateService { keyTemplateMapper.deleteById(id); } - private KeyTemplate mapToEntity(KeyTemplateDTO.Save save) { + private KeyTemplate mapToEntity(KeyTemplateDTO.KTSave save) { KeyTemplate entity = new KeyTemplate(); entity.setCode(save.getCode()); entity.setName(save.getName()); @@ -133,7 +133,7 @@ public class KeyTemplateServiceImpl implements KeyTemplateService { return entity; } - private void checkEnum(KeyTemplateDTO.Save save) { + private void checkEnum(KeyTemplateDTO.KTSave save) { KeyCategory keyCategory = KeyCategory.of(save.getKeyType()); Assert.notNull(keyCategory, "不支持的密钥类型: " + save.getKeyType()); KeyAlg keyAlg = KeyAlg.of(save.getKeyAlg()); diff --git a/pom.xml b/pom.xml index 7f250d4..c6c0e56 100644 --- a/pom.xml +++ b/pom.xml @@ -106,17 +106,6 @@ always - - tencent - tencent maven - https://mirrors.cloud.tencent.com/nexus/repository/maven-public/ - - true - - - true - -