From dcfa66b12eab8ac32b9abb837a8537ee0114e8e8 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Wed, 24 Jan 2024 17:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=A2=9E=E5=8A=A0BZ=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProtocolInfoController.java | 16 ++--- .../controller/ServiceResourceController.java | 60 +++++++++---------- ...a => BzServiceResourceMonitorRMapper.java} | 12 ++-- ...{ProtocolInfo.java => BzProtocolInfo.java} | 4 +- ...ceResource.java => BzServiceResource.java} | 4 +- ...rR.java => BzServiceResourceMonitorR.java} | 4 +- ...ceType.java => BzServiceResourceType.java} | 4 +- ... => BzServiceResourceMonitorRService.java} | 33 +++++----- .../xyt/service/ProtocolInfoService.java | 32 +++++----- ...tocolInfoSo.java => BzProtocolInfoSo.java} | 2 +- ...sourceSo.java => BzServiceResourceSo.java} | 2 +- ...peSo.java => BzServiceResourceTypeSo.java} | 4 +- .../xyt/vo/ServiceResourceMonitorVo.java | 4 +- 13 files changed, 89 insertions(+), 92 deletions(-) rename src/main/java/com/gunshi/project/xyt/mapper/{ServiceResourceMonitorRMapper.java => BzServiceResourceMonitorRMapper.java} (74%) rename src/main/java/com/gunshi/project/xyt/model/{ProtocolInfo.java => BzProtocolInfo.java} (97%) rename src/main/java/com/gunshi/project/xyt/model/{ServiceResource.java => BzServiceResource.java} (97%) rename src/main/java/com/gunshi/project/xyt/model/{ServiceResourceMonitorR.java => BzServiceResourceMonitorR.java} (95%) rename src/main/java/com/gunshi/project/xyt/model/{ServiceResourceType.java => BzServiceResourceType.java} (93%) rename src/main/java/com/gunshi/project/xyt/service/{ServiceResourceMonitorRService.java => BzServiceResourceMonitorRService.java} (55%) rename src/main/java/com/gunshi/project/xyt/so/{ProtocolInfoSo.java => BzProtocolInfoSo.java} (97%) rename src/main/java/com/gunshi/project/xyt/so/{ServiceResourceSo.java => BzServiceResourceSo.java} (95%) rename src/main/java/com/gunshi/project/xyt/so/{ServiceResourceTypeSo.java => BzServiceResourceTypeSo.java} (81%) diff --git a/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java b/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java index b675a41..03e8101 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java @@ -2,10 +2,10 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.ProtocolInfo; -import com.gunshi.project.xyt.model.ProtocolInfoAutoDao; +import com.gunshi.project.xyt.model.BzProtocolInfo; +import com.gunshi.project.xyt.model.BzProtocolInfoAutoDao; import com.gunshi.project.xyt.service.ProtocolInfoService; -import com.gunshi.project.xyt.so.ProtocolInfoSo; +import com.gunshi.project.xyt.so.BzProtocolInfoSo; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.tags.Tag; @@ -27,13 +27,13 @@ import java.util.Date; @Tag(name = "协议信息") public class ProtocolInfoController { @Autowired - private ProtocolInfoAutoDao dao; + private BzProtocolInfoAutoDao dao; @Autowired private ProtocolInfoService service; @PostMapping("/save") - public R save(@Validated({Insert.class}) @RequestBody ProtocolInfo entity) { + public R save(@Validated({Insert.class}) @RequestBody BzProtocolInfo entity) { // todo 无论是数据库设置默认值为GETDATE()还是使用注解fill = FieldFill.INSERT都不能自动插入当前时间 entity.setCreateTm(new Date()); entity.setEnable(1); @@ -41,7 +41,7 @@ public class ProtocolInfoController { } @PostMapping("/update") - public R update(@Validated({Update.class}) @RequestBody ProtocolInfo entity) { + public R update(@Validated({Update.class}) @RequestBody BzProtocolInfo entity) { return R.ok(dao.updateById(entity)); } @@ -51,12 +51,12 @@ public class ProtocolInfoController { } @GetMapping("/get/{id}") - public R getById(@PathVariable("id") String id) { + public R getById(@PathVariable("id") String id) { return R.ok(dao.getById(id)); } @PostMapping("/page") - public R> page(@Validated @RequestBody ProtocolInfoSo so) { + public R> page(@Validated @RequestBody BzProtocolInfoSo so) { return R.ok(service.page(so)); } } diff --git a/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java b/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java index 995ad4e..58ce3cc 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java @@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.ServiceResource; -import com.gunshi.project.xyt.model.ServiceResourceAutoDao; -import com.gunshi.project.xyt.model.ServiceResourceType; -import com.gunshi.project.xyt.model.ServiceResourceTypeAutoDao; -import com.gunshi.project.xyt.service.ServiceResourceMonitorRService; -import com.gunshi.project.xyt.so.ServiceResourceSo; -import com.gunshi.project.xyt.so.ServiceResourceTypeSo; +import com.gunshi.project.xyt.model.BzServiceResource; +import com.gunshi.project.xyt.model.BzServiceResourceAutoDao; +import com.gunshi.project.xyt.model.BzServiceResourceType; +import com.gunshi.project.xyt.model.BzServiceResourceTypeAutoDao; +import com.gunshi.project.xyt.service.BzServiceResourceMonitorRService; +import com.gunshi.project.xyt.so.BzServiceResourceSo; +import com.gunshi.project.xyt.so.BzServiceResourceTypeSo; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.QueryPage; import com.gunshi.project.xyt.validate.markers.QueryTimeRange; @@ -37,16 +37,16 @@ import java.util.Date; public class ServiceResourceController { @Autowired - private ServiceResourceAutoDao serviceResourceDao; + private BzServiceResourceAutoDao serviceResourceDao; @Autowired - private ServiceResourceMonitorRService serviceMonitorService; + private BzServiceResourceMonitorRService serviceMonitorService; @Autowired - private ServiceResourceTypeAutoDao serviceTypeDao; + private BzServiceResourceTypeAutoDao serviceTypeDao; @PostMapping("/save") - public R save(@Validated(Insert.class) @RequestBody ServiceResource entity) { + public R save(@Validated(Insert.class) @RequestBody BzServiceResource entity) { entity.setId(IdWorker.getIdStr()); entity.setRegisterDate(new Date()); entity.setEnable(1); @@ -54,8 +54,8 @@ public class ServiceResourceController { } @PostMapping("/update") - public R update(@Validated(Update.class) @RequestBody ServiceResource entity) { - ServiceResource byId = serviceResourceDao.getById(entity.getId()); + public R update(@Validated(Update.class) @RequestBody BzServiceResource entity) { + BzServiceResource byId = serviceResourceDao.getById(entity.getId()); if (byId == null) { return R.error(400, "数据不存在", false); } @@ -70,38 +70,38 @@ public class ServiceResourceController { } @PostMapping("/page") - public R> page( - @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody ServiceResourceSo so + public R> page( + @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so ) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if (StringUtils.isNotEmpty(so.getName())) { - query.like(ServiceResource::getName, so.getName()); + query.like(BzServiceResource::getName, so.getName()); } - query.le(ServiceResource::getRegisterDate, so.getTimeSo().getEnd()); - query.ge(ServiceResource::getRegisterDate, so.getTimeSo().getStart()); - query.orderByDesc(ServiceResource::getRegisterDate); + query.le(BzServiceResource::getRegisterDate, so.getTimeSo().getEnd()); + query.ge(BzServiceResource::getRegisterDate, so.getTimeSo().getStart()); + query.orderByDesc(BzServiceResource::getRegisterDate); - Page page = serviceResourceDao.page(so.getPageSo().toPage(), query); + Page page = serviceResourceDao.page(so.getPageSo().toPage(), query); return R.ok(page); } @PostMapping("/monitor/page") public R> pageMonitorR( - @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody ServiceResourceSo so + @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so ) { Page page = serviceMonitorService.page(so.getPageSo().toPage(), so); return R.ok(page); } @PostMapping("/type/save") - public R saveType(@Validated(Insert.class) @RequestBody ServiceResourceType entity) { + public R saveType(@Validated(Insert.class) @RequestBody BzServiceResourceType entity) { entity.setId(IdWorker.getIdStr()); return R.ok(serviceTypeDao.save(entity)); } @PostMapping("/type/update") - public R updateType(@Validated(Update.class) @RequestBody ServiceResourceType entity) { + public R updateType(@Validated(Update.class) @RequestBody BzServiceResourceType entity) { return R.ok(serviceTypeDao.updateById(entity)); } @@ -111,18 +111,18 @@ public class ServiceResourceController { } @PostMapping("/type/page") - public R> pageType( - @Validated({QueryPage.class}) @RequestBody ServiceResourceTypeSo so + public R> pageType( + @Validated({QueryPage.class}) @RequestBody BzServiceResourceTypeSo so ) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if (StringUtils.isNotEmpty(so.getName())) { - query.like(ServiceResourceType::getName, so.getName()); + query.like(BzServiceResourceType::getName, so.getName()); } if (StringUtils.isNotEmpty(so.getType())) { - query.like(ServiceResourceType::getType, so.getType()); + query.like(BzServiceResourceType::getType, so.getType()); } - Page page = serviceTypeDao.page(so.getPageSo().toPage(), query); + Page page = serviceTypeDao.page(so.getPageSo().toPage(), query); return R.ok(page); } } diff --git a/src/main/java/com/gunshi/project/xyt/mapper/ServiceResourceMonitorRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java similarity index 74% rename from src/main/java/com/gunshi/project/xyt/mapper/ServiceResourceMonitorRMapper.java rename to src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java index 25705e6..6c5fe6e 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/ServiceResourceMonitorRMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java @@ -1,25 +1,25 @@ package com.gunshi.project.xyt.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.so.ServiceResourceSo; +import com.gunshi.project.xyt.so.BzServiceResourceSo; import com.gunshi.project.xyt.vo.ServiceResourceMonitorVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** - * 类描述 + * 服务资源及监控联合查询Mapper * * @author lyf * @version 1.0.0 * @since 2024-01-24 */ @Mapper -public interface ServiceResourceMonitorRMapper { +public interface BzServiceResourceMonitorRMapper { @Select(""" """) - Page page(@Param("page") Page page,@Param("so") ServiceResourceSo so); + Page page(@Param("page") Page page,@Param("so") BzServiceResourceSo so); } diff --git a/src/main/java/com/gunshi/project/xyt/model/ProtocolInfo.java b/src/main/java/com/gunshi/project/xyt/model/BzProtocolInfo.java similarity index 97% rename from src/main/java/com/gunshi/project/xyt/model/ProtocolInfo.java rename to src/main/java/com/gunshi/project/xyt/model/BzProtocolInfo.java index 63b2e70..fb4fbc0 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ProtocolInfo.java +++ b/src/main/java/com/gunshi/project/xyt/model/BzProtocolInfo.java @@ -25,8 +25,8 @@ import java.util.Date; @Data @ToString @Schema(description = "接收协议") -@TableName("PROTOCOL_INFO") -public class ProtocolInfo { +@TableName("BZ_PROTOCOL_INFO") +public class BzProtocolInfo { @NotEmpty(message = "协议编码不能为空", groups = {Insert.class, Update.class}) @Schema(description = "协议编码") diff --git a/src/main/java/com/gunshi/project/xyt/model/ServiceResource.java b/src/main/java/com/gunshi/project/xyt/model/BzServiceResource.java similarity index 97% rename from src/main/java/com/gunshi/project/xyt/model/ServiceResource.java rename to src/main/java/com/gunshi/project/xyt/model/BzServiceResource.java index af4703d..123f821 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ServiceResource.java +++ b/src/main/java/com/gunshi/project/xyt/model/BzServiceResource.java @@ -24,8 +24,8 @@ import java.util.Date; @Data @ToString @Schema(description = "服务资源") -@TableName("SERVICE_RESOURCE") -public class ServiceResource { +@TableName("BZ_SERVICE_RESOURCE") +public class BzServiceResource { @Schema(description = "id") @TableId("ID") diff --git a/src/main/java/com/gunshi/project/xyt/model/ServiceResourceMonitorR.java b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java similarity index 95% rename from src/main/java/com/gunshi/project/xyt/model/ServiceResourceMonitorR.java rename to src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java index f2c44e7..eb8251c 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ServiceResourceMonitorR.java +++ b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java @@ -21,8 +21,8 @@ import java.util.Date; @Data @ToString @Schema(description = "服务资源监控记录") -@TableName("SERVICE_RESOURCE_R") -public class ServiceResourceMonitorR { +@TableName("BZ_SERVICE_RESOURCE_R") +public class BzServiceResourceMonitorR { @Schema(description = "id") @TableId("ID") diff --git a/src/main/java/com/gunshi/project/xyt/model/ServiceResourceType.java b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceType.java similarity index 93% rename from src/main/java/com/gunshi/project/xyt/model/ServiceResourceType.java rename to src/main/java/com/gunshi/project/xyt/model/BzServiceResourceType.java index 55e6dba..3dcfe7f 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ServiceResourceType.java +++ b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceType.java @@ -21,8 +21,8 @@ import lombok.ToString; @Data @ToString @Schema(description = "服务类型") -@TableName("SERVICE_RESOURCE_TYPE") -public class ServiceResourceType { +@TableName("BZ_SERVICE_RESOURCE_TYPE") +public class BzServiceResourceType { @Schema(description = "id") @TableId("ID") private String id; diff --git a/src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java b/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java similarity index 55% rename from src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java rename to src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java index b8a345e..5e22b99 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java @@ -1,14 +1,13 @@ package com.gunshi.project.xyt.service; -import cn.hutool.db.Db; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.mapper.ServiceResourceMonitorRMapper; -import com.gunshi.project.xyt.model.ServiceResource; -import com.gunshi.project.xyt.model.ServiceResourceAutoDao; -import com.gunshi.project.xyt.model.ServiceResourceMonitorR; -import com.gunshi.project.xyt.model.ServiceResourceMonitorRAutoDao; -import com.gunshi.project.xyt.so.ServiceResourceSo; +import com.gunshi.project.xyt.mapper.BzServiceResourceMonitorRMapper; +import com.gunshi.project.xyt.model.BzServiceResource; +import com.gunshi.project.xyt.model.BzServiceResourceAutoDao; +import com.gunshi.project.xyt.model.BzServiceResourceMonitorR; +import com.gunshi.project.xyt.model.BzServiceResourceMonitorRAutoDao; +import com.gunshi.project.xyt.so.BzServiceResourceSo; import com.gunshi.project.xyt.vo.ServiceResourceMonitorVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -25,37 +24,37 @@ import java.util.List; * @since 2024-01-24 */ @Service -public class ServiceResourceMonitorRService { +public class BzServiceResourceMonitorRService { @Autowired - private ServiceResourceAutoDao serviceResourceDao; + private BzServiceResourceAutoDao serviceResourceDao; @Autowired - private ServiceResourceMonitorRAutoDao serviceMonitorDao; + private BzServiceResourceMonitorRAutoDao serviceMonitorDao; @Autowired - private ServiceResourceMonitorRMapper serviceMonitorMapper; + private BzServiceResourceMonitorRMapper serviceMonitorMapper; - public Page page(Page page, ServiceResourceSo so) { + public Page page(Page page, BzServiceResourceSo so) { return serviceMonitorMapper.page(page, so); } @Transactional public Boolean removeById(String id) { - ServiceResource byId = serviceResourceDao.getById(id); + BzServiceResource byId = serviceResourceDao.getById(id); if (byId == null) { return false; } return serviceResourceDao.removeById(id) && serviceMonitorDao.remove( - new LambdaQueryWrapper() - .eq(ServiceResourceMonitorR::getSrId, id) + new LambdaQueryWrapper() + .eq(BzServiceResourceMonitorR::getSrId, id) ); } public void scanByTm() { - List serviceResources = serviceResourceDao.list(); - for (ServiceResource serviceResource : serviceResources) { + List serviceResources = serviceResourceDao.list(); + for (BzServiceResource serviceResource : serviceResources) { if (StringUtils.isNotEmpty(serviceResource.getTargetTable()) && StringUtils.isNotEmpty(serviceResource.getTargetTmField())) { // Db.getMap(new QueryWrapper<>().orderByDesc(serviceResource.getTargetTmField()).last("limit 1"), serviceResource.getTargetTable()); diff --git a/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java b/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java index a891e03..bb22ca5 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java @@ -2,9 +2,9 @@ package com.gunshi.project.xyt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.so.ProtocolInfoSo; -import com.gunshi.project.xyt.model.ProtocolInfo; -import com.gunshi.project.xyt.model.ProtocolInfoAutoDao; +import com.gunshi.project.xyt.model.BzProtocolInfo; +import com.gunshi.project.xyt.model.BzProtocolInfoAutoDao; +import com.gunshi.project.xyt.so.BzProtocolInfoSo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,39 +21,39 @@ import java.util.List; @Service public class ProtocolInfoService { @Autowired - private ProtocolInfoAutoDao dao; + private BzProtocolInfoAutoDao dao; - public Page page(ProtocolInfoSo so) { + public Page page(BzProtocolInfoSo so) { if (StringUtils.isNotEmpty(so.getId())) { - ProtocolInfo entity = dao.getById(so.getId()); + BzProtocolInfo entity = dao.getById(so.getId()); if (entity == null) { return null; } - List records = List.of(entity); - return new Page(1, 1, 1).setRecords(records); + List records = List.of(entity); + return new Page(1, 1, 1).setRecords(records); } - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if (StringUtils.isNotEmpty(so.getName())) { - query.like(StringUtils.isNotEmpty(so.getName()),ProtocolInfo::getName, so.getName()); + query.like(StringUtils.isNotEmpty(so.getName()), BzProtocolInfo::getName, so.getName()); } if (StringUtils.isNotEmpty(so.getIp())) { - query.like(ProtocolInfo::getIp, so.getIp()); + query.like(BzProtocolInfo::getIp, so.getIp()); } if (so.getPort() != null) { - query.eq(ProtocolInfo::getPort, so.getPort()); + query.eq(BzProtocolInfo::getPort, so.getPort()); } if (StringUtils.isNotEmpty(so.getStd())) { - query.like(ProtocolInfo::getStd, so.getStd()); + query.like(BzProtocolInfo::getStd, so.getStd()); } if (StringUtils.isNotEmpty(so.getTrans())) { - query.like(ProtocolInfo::getTrans, so.getTrans()); + query.like(BzProtocolInfo::getTrans, so.getTrans()); } if (so.getEnable() != null) { - query.eq(ProtocolInfo::getEnable, so.getEnable()); + query.eq(BzProtocolInfo::getEnable, so.getEnable()); } - query.orderByDesc(ProtocolInfo::getCreateTm); + query.orderByDesc(BzProtocolInfo::getCreateTm); return dao.page(so.getPageSo().toPage(), query); } diff --git a/src/main/java/com/gunshi/project/xyt/so/ProtocolInfoSo.java b/src/main/java/com/gunshi/project/xyt/so/BzProtocolInfoSo.java similarity index 97% rename from src/main/java/com/gunshi/project/xyt/so/ProtocolInfoSo.java rename to src/main/java/com/gunshi/project/xyt/so/BzProtocolInfoSo.java index 8771a8b..a2f017d 100644 --- a/src/main/java/com/gunshi/project/xyt/so/ProtocolInfoSo.java +++ b/src/main/java/com/gunshi/project/xyt/so/BzProtocolInfoSo.java @@ -16,7 +16,7 @@ import lombok.Data; */ @Data @Schema(description = "协议信息查询参数") -public class ProtocolInfoSo { +public class BzProtocolInfoSo { @NotNull(message = "分页参数不能为空") private PageSo pageSo; diff --git a/src/main/java/com/gunshi/project/xyt/so/ServiceResourceSo.java b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java similarity index 95% rename from src/main/java/com/gunshi/project/xyt/so/ServiceResourceSo.java rename to src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java index 9812a9f..ba2e239 100644 --- a/src/main/java/com/gunshi/project/xyt/so/ServiceResourceSo.java +++ b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java @@ -17,7 +17,7 @@ import lombok.Data; */ @Data @Schema(description = "服务资源查询参数") -public class ServiceResourceSo { +public class BzServiceResourceSo { @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) private PageSo pageSo; diff --git a/src/main/java/com/gunshi/project/xyt/so/ServiceResourceTypeSo.java b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceTypeSo.java similarity index 81% rename from src/main/java/com/gunshi/project/xyt/so/ServiceResourceTypeSo.java rename to src/main/java/com/gunshi/project/xyt/so/BzServiceResourceTypeSo.java index 90150d2..a7552ce 100644 --- a/src/main/java/com/gunshi/project/xyt/so/ServiceResourceTypeSo.java +++ b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceTypeSo.java @@ -1,9 +1,7 @@ package com.gunshi.project.xyt.so; -import com.gunshi.db.dto.DateTimeRangeSo; import com.gunshi.db.dto.PageSo; import com.gunshi.project.xyt.validate.markers.QueryPage; -import com.gunshi.project.xyt.validate.markers.QueryTimeRange; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -17,7 +15,7 @@ import lombok.Data; */ @Data @Schema(description = "服务资源查询参数") -public class ServiceResourceTypeSo { +public class BzServiceResourceTypeSo { @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) private PageSo pageSo; diff --git a/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java b/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java index af7b057..fdc2555 100644 --- a/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java +++ b/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java @@ -16,7 +16,7 @@ import java.util.Date; * @since 2024-01-24 */ public class ServiceResourceMonitorVo { - //region ServiceResourceMonitorR + //region BzServiceResourceMonitorR @Schema(description = "id") @TableId("ID") private Long id; @@ -55,7 +55,7 @@ public class ServiceResourceMonitorVo { private Long yearlyCount; //endregion - //region ServiceResource + //region BzServiceResource @Schema(description = "服务名称") @TableField("NAME") private String name;