From 06cbf48e7cfd591ebf74b06e6f1df68688de25ba Mon Sep 17 00:00:00 2001 From: lyf66 Date: Wed, 24 Jan 2024 17:07:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E5=BB=BA=E6=A8=A1=E5=BB=BA=E8=A1=A8=EF=BC=8C=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 服务资源的建模建表，基础增删改查 服务资源类型的建模建表，基础增删改查 --- .../java/com/gunshi/project/xyt/Main.java | 6 - .../xyt/controller/PingController.java | 2 + .../controller/ProtocolInfoController.java | 62 +++++++ .../controller/ServiceResourceController.java | 128 +++++++++++++ .../mapper/ServiceResourceMonitorRMapper.java | 36 ++++ .../project/xyt/model/ProtocolInfo.java | 68 +++++++ .../project/xyt/model/ServiceResource.java | 102 +++++++++++ .../xyt/model/ServiceResourceMonitorR.java | 64 +++++++ .../xyt/model/ServiceResourceType.java | 39 ++++ .../xyt/service/ProtocolInfoService.java | 60 +++++++ .../ServiceResourceMonitorRService.java | 65 +++++++ .../gunshi/project/xyt/so/ProtocolInfoSo.java | 46 +++++ .../project/xyt/so/ServiceResourceSo.java | 30 ++++ .../project/xyt/so/ServiceResourceTypeSo.java | 30 ++++ .../project/xyt/validate/markers/Delete.java | 11 ++ .../project/xyt/validate/markers/Insert.java | 11 ++ .../project/xyt/validate/markers/Query.java | 11 ++ .../xyt/validate/markers/QueryPage.java | 11 ++ .../xyt/validate/markers/QueryTimeRange.java | 11 ++ .../project/xyt/validate/markers/Update.java | 11 ++ .../xyt/vo/ServiceResourceMonitorVo.java | 63 +++++++ src/main/resources/application.yml | 3 + src/main/resources/sql/ServiceResource.sql | 168 ++++++++++++++++++ .../java/com/gunshi/project/xyt/TestMain.java | 16 ++ .../xyt/controller/TestController.java | 23 +++ src/test/resources/application.yml | 15 +- 26 files changed, 1079 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java create mode 100644 src/main/java/com/gunshi/project/xyt/mapper/ServiceResourceMonitorRMapper.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/ProtocolInfo.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/ServiceResource.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/ServiceResourceMonitorR.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/ServiceResourceType.java create mode 100644 src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java create mode 100644 src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java create mode 100644 src/main/java/com/gunshi/project/xyt/so/ProtocolInfoSo.java create mode 100644 src/main/java/com/gunshi/project/xyt/so/ServiceResourceSo.java create mode 100644 src/main/java/com/gunshi/project/xyt/so/ServiceResourceTypeSo.java create mode 100644 src/main/java/com/gunshi/project/xyt/validate/markers/Delete.java create mode 100644 src/main/java/com/gunshi/project/xyt/validate/markers/Insert.java create mode 100644 src/main/java/com/gunshi/project/xyt/validate/markers/Query.java create mode 100644 src/main/java/com/gunshi/project/xyt/validate/markers/QueryPage.java create mode 100644 src/main/java/com/gunshi/project/xyt/validate/markers/QueryTimeRange.java create mode 100644 src/main/java/com/gunshi/project/xyt/validate/markers/Update.java create mode 100644 src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java create mode 100644 src/main/resources/sql/ServiceResource.sql create mode 100644 src/test/java/com/gunshi/project/xyt/TestMain.java create mode 100644 src/test/java/com/gunshi/project/xyt/controller/TestController.java diff --git a/src/main/java/com/gunshi/project/xyt/Main.java b/src/main/java/com/gunshi/project/xyt/Main.java index 0727ee8..2b971ed 100644 --- a/src/main/java/com/gunshi/project/xyt/Main.java +++ b/src/main/java/com/gunshi/project/xyt/Main.java @@ -6,12 +6,6 @@ import io.swagger.v3.oas.annotations.servers.Server; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.annotation.EnableScheduling; /** * 类描述 diff --git a/src/main/java/com/gunshi/project/xyt/controller/PingController.java b/src/main/java/com/gunshi/project/xyt/controller/PingController.java index 0a7766d..a705294 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/PingController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/PingController.java @@ -1,5 +1,6 @@ package com.gunshi.project.xyt.controller; +import com.gunshi.logging.access.annotation.LoginLogging; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/ping") public class PingController { @Operation(summary = "测试接口") + @LoginLogging @GetMapping("") public String ping() { return "pong"; diff --git a/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java b/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java new file mode 100644 index 0000000..b675a41 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java @@ -0,0 +1,62 @@ +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.service.ProtocolInfoService; +import com.gunshi.project.xyt.so.ProtocolInfoSo; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; + +/** + * 协议信息控制器接口类 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +@RestController +@RequestMapping("/protocolInfo") +@Tag(name = "协议信息") +public class ProtocolInfoController { + @Autowired + private ProtocolInfoAutoDao dao; + + @Autowired + private ProtocolInfoService service; + + @PostMapping("/save") + public R save(@Validated({Insert.class}) @RequestBody ProtocolInfo entity) { + // todo 无论是数据库设置默认值为GETDATE()还是使用注解fill = FieldFill.INSERT都不能自动插入当前时间 + entity.setCreateTm(new Date()); + entity.setEnable(1); + return R.ok(dao.save(entity)); + } + + @PostMapping("/update") + public R update(@Validated({Update.class}) @RequestBody ProtocolInfo entity) { + return R.ok(dao.updateById(entity)); + } + + @GetMapping("/delete/{id}") + public R delete(@PathVariable String id) { + return R.ok(dao.removeById(id)); + } + + @GetMapping("/get/{id}") + public R getById(@PathVariable("id") String id) { + return R.ok(dao.getById(id)); + } + + @PostMapping("/page") + public R> page(@Validated @RequestBody ProtocolInfoSo 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 new file mode 100644 index 0000000..995ad4e --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java @@ -0,0 +1,128 @@ +package com.gunshi.project.xyt.controller; + +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.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.QueryPage; +import com.gunshi.project.xyt.validate.markers.QueryTimeRange; +import com.gunshi.project.xyt.validate.markers.Update; +import com.gunshi.project.xyt.vo.ServiceResourceMonitorVo; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; + +/** + * 服务资源及监控控制器接口类 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +@RestController +@RequestMapping("/serviceResource") +@Tag(name = "服务资源及监控") +public class ServiceResourceController { + + @Autowired + private ServiceResourceAutoDao serviceResourceDao; + + @Autowired + private ServiceResourceMonitorRService serviceMonitorService; + + @Autowired + private ServiceResourceTypeAutoDao serviceTypeDao; + + @PostMapping("/save") + public R save(@Validated(Insert.class) @RequestBody ServiceResource entity) { + entity.setId(IdWorker.getIdStr()); + entity.setRegisterDate(new Date()); + entity.setEnable(1); + return R.ok(serviceResourceDao.save(entity)); + } + + @PostMapping("/update") + public R update(@Validated(Update.class) @RequestBody ServiceResource entity) { + ServiceResource byId = serviceResourceDao.getById(entity.getId()); + if (byId == null) { + return R.error(400, "数据不存在", false); + } + + entity.setRegisterDate(byId.getRegisterDate()); + return R.ok(serviceResourceDao.updateById(entity)); + } + + @GetMapping("/delete/{id}") + public R delete(@PathVariable("id") String id) { + return R.ok(serviceMonitorService.removeById(id)); + } + + @PostMapping("/page") + public R> page( + @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody ServiceResourceSo so + ) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(so.getName())) { + query.like(ServiceResource::getName, so.getName()); + } + + query.le(ServiceResource::getRegisterDate, so.getTimeSo().getEnd()); + query.ge(ServiceResource::getRegisterDate, so.getTimeSo().getStart()); + query.orderByDesc(ServiceResource::getRegisterDate); + + 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 + ) { + Page page = serviceMonitorService.page(so.getPageSo().toPage(), so); + return R.ok(page); + } + + @PostMapping("/type/save") + public R saveType(@Validated(Insert.class) @RequestBody ServiceResourceType entity) { + entity.setId(IdWorker.getIdStr()); + return R.ok(serviceTypeDao.save(entity)); + } + + @PostMapping("/type/update") + public R updateType(@Validated(Update.class) @RequestBody ServiceResourceType entity) { + return R.ok(serviceTypeDao.updateById(entity)); + } + + @GetMapping("/type/delete/{id}") + public R deleteType(@PathVariable("id") String id) { + return R.ok(serviceTypeDao.removeById(id)); + } + + @PostMapping("/type/page") + public R> pageType( + @Validated({QueryPage.class}) @RequestBody ServiceResourceTypeSo so + ) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(so.getName())) { + query.like(ServiceResourceType::getName, so.getName()); + } + if (StringUtils.isNotEmpty(so.getType())) { + query.like(ServiceResourceType::getType, so.getType()); + } + + 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/ServiceResourceMonitorRMapper.java new file mode 100644 index 0000000..25705e6 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/mapper/ServiceResourceMonitorRMapper.java @@ -0,0 +1,36 @@ +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.vo.ServiceResourceMonitorVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +@Mapper +public interface ServiceResourceMonitorRMapper { + @Select(""" + + """) + Page page(@Param("page") Page page,@Param("so") ServiceResourceSo so); +} diff --git a/src/main/java/com/gunshi/project/xyt/model/ProtocolInfo.java b/src/main/java/com/gunshi/project/xyt/model/ProtocolInfo.java new file mode 100644 index 0000000..63b2e70 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/ProtocolInfo.java @@ -0,0 +1,68 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gunshi.core.dateformat.DateFormatString; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.ToString; + +import java.util.Date; + +/** + * 接收协议 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +@Data +@ToString +@Schema(description = "接收协议") +@TableName("PROTOCOL_INFO") +public class ProtocolInfo { + + @NotEmpty(message = "协议编码不能为空", groups = {Insert.class, Update.class}) + @Schema(description = "协议编码") + @TableId("ID") + private String id; + + @NotEmpty(message = "协议名称不能为空", groups = {Insert.class}) + @Schema(description = "协议名称") + @TableField("NAME") + private String name; + + @NotEmpty(message = "IP地址不能为空", groups = {Insert.class}) + @Schema(description = "IP地址") + @TableField("IP") + private String ip; + + @NotNull(message = "监听端口不能为空", groups = {Insert.class}) + @Schema(description = "监听端口") + @TableField("PORT") + private Integer port; + + @NotEmpty(message = "协议标准不能为空", groups = {Insert.class}) + @Schema(description = "协议标准") + @TableField("STD") + private String std; + + @Schema(description = "传输协议，TCP或UDP") + @TableField("TRANS") + private String trans; + + @Schema(description = "是否启用", $comment = "1启用，0不启用，默认1") + @TableField(value = "ENABLE") + private Integer enable; + + @Schema(description = "创建时间") + @TableField(value = "CREATE_TM") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date createTm; +} diff --git a/src/main/java/com/gunshi/project/xyt/model/ServiceResource.java b/src/main/java/com/gunshi/project/xyt/model/ServiceResource.java new file mode 100644 index 0000000..af4703d --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/ServiceResource.java @@ -0,0 +1,102 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gunshi.core.dateformat.DateFormatString; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; +import lombok.ToString; + +import java.util.Date; + +/** + * 数据共享服务公共资源属性 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +@Data +@ToString +@Schema(description = "服务资源") +@TableName("SERVICE_RESOURCE") +public class ServiceResource { + + @Schema(description = "id") + @TableId("ID") + @NotEmpty(message = "服务ID不能为空", groups = {Update.class}) + private String id; + + @Schema(description = "服务名称") + @TableField("NAME") + @NotEmpty(message = "服务名称不能为空", groups = {Insert.class}) + private String name; + + @Schema(description = "服务描述") + @TableField("DESCRIPTION") + private String description; + + @Schema(description = "服务类型") + @TableField("SERVICE_TYPE") + private String serviceType; + + @Schema(description = "服务地址") + @TableField("URL") + private String url; + + @Schema(description = "服务端口") + @TableField("PORT") + private Integer port; + + @Schema(description = "服务提供者") + @TableField("PROVIDER") + private String provider; + + @Schema(description = "目标表") + @TableField("TARGET_TABLE") + private String targetTable; + + @Schema(description = "目标时间依据字段") + @TableField("TARGET_TM_FIELD") + private String targetTmField; + + @Schema(description = "路由") + @TableField("ROUTE") + private String route; + + @Schema(description = "联系人") + @TableField("CONTACT") + private String contact; + + @Schema(description = "联系电话") + @TableField("PHONE") + private String phone; + + @Schema(description = "注册日期") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD, timezone = "GMT+8") + @TableField("REGISTER_DATE") + private Date registerDate; + + @Schema(description = "修改日期") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + @TableField("UPDATE_TM") + private Date updateTm; + + @Schema(description = "是否启用，0-停用，1-启用") + @TableField("ENABLE") + private Integer enable; + + @Schema(description = "状态，0-不在线/异常，1-在线/正常") + @TableField("STATUS") + private Integer status; + + @Schema(description = "最近数据时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + @TableField("LAST_DATA_TM") + private Date lastChangeTm; +} diff --git a/src/main/java/com/gunshi/project/xyt/model/ServiceResourceMonitorR.java b/src/main/java/com/gunshi/project/xyt/model/ServiceResourceMonitorR.java new file mode 100644 index 0000000..f2c44e7 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/ServiceResourceMonitorR.java @@ -0,0 +1,64 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gunshi.core.dateformat.DateFormatString; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +import java.util.Date; + +/** + * 服务资源监控记录 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +@Data +@ToString +@Schema(description = "服务资源监控记录") +@TableName("SERVICE_RESOURCE_R") +public class ServiceResourceMonitorR { + + @Schema(description = "id") + @TableId("ID") + private Long id; + + @Schema(description = "服务资源id") + @TableField("SR_ID") + private String srId; + + @Schema(description = "最近数据时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + @TableField("LAST_CHANGE_TM") + private Date lastChangeTm; + + @Schema(description = "共享数据(条)") + @TableField("RECORD_COUNT") + private Long recordCount; + + @Schema(description = "共享站点数量") + @TableField("ST_COUNT") + private Integer stCount; + + @Schema(description = "今日共享数据(条)") + @TableField("TODAY_COUNT") + private Long todayCount; + + @Schema(description = "本周共享数据(条)") + @TableField("WEEKLY_COUNT") + private Long weeklyCount; + + @Schema(description = "本月共享数据(条)") + @TableField("MONTHLY_COUNT") + private Long monthlyCount; + + @Schema(description = "本年共享数据(条)") + @TableField("YEARLY_COUNT") + private Long yearlyCount; + +} diff --git a/src/main/java/com/gunshi/project/xyt/model/ServiceResourceType.java b/src/main/java/com/gunshi/project/xyt/model/ServiceResourceType.java new file mode 100644 index 0000000..55e6dba --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/ServiceResourceType.java @@ -0,0 +1,39 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; +import lombok.ToString; + +/** + * 服务类型 + * 纯字典，无意义，无关联，应标 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +@Data +@ToString +@Schema(description = "服务类型") +@TableName("SERVICE_RESOURCE_TYPE") +public class ServiceResourceType { + @Schema(description = "id") + @TableId("ID") + private String id; + + @Schema(description = "服务类型") + @TableField("TYPE") + @NotEmpty(message = "服务类型不能为空", groups = {Insert.class, Update.class}) + private String type; + + @Schema(description = "服务名称") + @TableField("NAME") + @NotEmpty(message = "服务类型不能为空", groups = {Insert.class, Update.class}) + private String name; +} diff --git a/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java b/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java new file mode 100644 index 0000000..a891e03 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java @@ -0,0 +1,60 @@ +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 org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +@Service +public class ProtocolInfoService { + @Autowired + private ProtocolInfoAutoDao dao; + + + public Page page(ProtocolInfoSo so) { + if (StringUtils.isNotEmpty(so.getId())) { + ProtocolInfo entity = dao.getById(so.getId()); + if (entity == null) { + return null; + } + List records = List.of(entity); + return new Page(1, 1, 1).setRecords(records); + } + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(so.getName())) { + query.like(StringUtils.isNotEmpty(so.getName()),ProtocolInfo::getName, so.getName()); + } + if (StringUtils.isNotEmpty(so.getIp())) { + query.like(ProtocolInfo::getIp, so.getIp()); + } + if (so.getPort() != null) { + query.eq(ProtocolInfo::getPort, so.getPort()); + } + if (StringUtils.isNotEmpty(so.getStd())) { + query.like(ProtocolInfo::getStd, so.getStd()); + } + if (StringUtils.isNotEmpty(so.getTrans())) { + query.like(ProtocolInfo::getTrans, so.getTrans()); + } + if (so.getEnable() != null) { + query.eq(ProtocolInfo::getEnable, so.getEnable()); + } + query.orderByDesc(ProtocolInfo::getCreateTm); + + return dao.page(so.getPageSo().toPage(), query); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java b/src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java new file mode 100644 index 0000000..b8a345e --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java @@ -0,0 +1,65 @@ +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.vo.ServiceResourceMonitorVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +@Service +public class ServiceResourceMonitorRService { + @Autowired + private ServiceResourceAutoDao serviceResourceDao; + + @Autowired + private ServiceResourceMonitorRAutoDao serviceMonitorDao; + + @Autowired + private ServiceResourceMonitorRMapper serviceMonitorMapper; + + public Page page(Page page, ServiceResourceSo so) { + return serviceMonitorMapper.page(page, so); + } + + @Transactional + public Boolean removeById(String id) { + ServiceResource byId = serviceResourceDao.getById(id); + if (byId == null) { + return false; + } + + return serviceResourceDao.removeById(id) && + serviceMonitorDao.remove( + new LambdaQueryWrapper() + .eq(ServiceResourceMonitorR::getSrId, id) + ); + } + + public void scanByTm() { + List serviceResources = serviceResourceDao.list(); + for (ServiceResource 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/so/ProtocolInfoSo.java b/src/main/java/com/gunshi/project/xyt/so/ProtocolInfoSo.java new file mode 100644 index 0000000..8771a8b --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/ProtocolInfoSo.java @@ -0,0 +1,46 @@ +package com.gunshi.project.xyt.so; + +import com.gunshi.db.dto.PageSo; +import com.gunshi.project.xyt.validate.markers.Query; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 协议信息查询参数 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +@Data +@Schema(description = "协议信息查询参数") +public class ProtocolInfoSo { + + @NotNull(message = "分页参数不能为空") + private PageSo pageSo; + + @Schema(description = "协议编码") + @NotEmpty(groups = {Query.class}) + private String id; + + @Schema(description = "协议名称") + private String name; + + @Schema(description = "IP地址") + private String ip; + + @Schema(description = "监听端口") + private Integer port; + + @Schema(description = "协议标准") + private String std; + + @Schema(description = "传输协议，TCP或UDP") + private String trans; + + @Schema(description = "是否启用， 1启用，0不启用，默认1") + private Integer enable; + +} diff --git a/src/main/java/com/gunshi/project/xyt/so/ServiceResourceSo.java b/src/main/java/com/gunshi/project/xyt/so/ServiceResourceSo.java new file mode 100644 index 0000000..9812a9f --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/ServiceResourceSo.java @@ -0,0 +1,30 @@ +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; + +/** + * 服务资源查询参数 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +@Data +@Schema(description = "服务资源查询参数") +public class ServiceResourceSo { + + @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) + private PageSo pageSo; + + @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) + private DateTimeRangeSo timeSo; + + @Schema(description = "服务名称") + private String name; +} diff --git a/src/main/java/com/gunshi/project/xyt/so/ServiceResourceTypeSo.java b/src/main/java/com/gunshi/project/xyt/so/ServiceResourceTypeSo.java new file mode 100644 index 0000000..90150d2 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/so/ServiceResourceTypeSo.java @@ -0,0 +1,30 @@ +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; + +/** + * 服务资源查询参数 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +@Data +@Schema(description = "服务资源查询参数") +public class ServiceResourceTypeSo { + + @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) + private PageSo pageSo; + + @Schema(description = "服务名称") + private String name; + + @Schema(description = "服务类型") + private String type; +} diff --git a/src/main/java/com/gunshi/project/xyt/validate/markers/Delete.java b/src/main/java/com/gunshi/project/xyt/validate/markers/Delete.java new file mode 100644 index 0000000..ce1fd19 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/validate/markers/Delete.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.validate.markers; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +public interface Delete { +} diff --git a/src/main/java/com/gunshi/project/xyt/validate/markers/Insert.java b/src/main/java/com/gunshi/project/xyt/validate/markers/Insert.java new file mode 100644 index 0000000..133f5d8 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/validate/markers/Insert.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.validate.markers; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +public interface Insert { +} diff --git a/src/main/java/com/gunshi/project/xyt/validate/markers/Query.java b/src/main/java/com/gunshi/project/xyt/validate/markers/Query.java new file mode 100644 index 0000000..b841456 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/validate/markers/Query.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.validate.markers; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +public interface Query { +} diff --git a/src/main/java/com/gunshi/project/xyt/validate/markers/QueryPage.java b/src/main/java/com/gunshi/project/xyt/validate/markers/QueryPage.java new file mode 100644 index 0000000..8ec1cc8 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/validate/markers/QueryPage.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.validate.markers; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +public interface QueryPage { +} diff --git a/src/main/java/com/gunshi/project/xyt/validate/markers/QueryTimeRange.java b/src/main/java/com/gunshi/project/xyt/validate/markers/QueryTimeRange.java new file mode 100644 index 0000000..40abca7 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/validate/markers/QueryTimeRange.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.validate.markers; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +public interface QueryTimeRange { +} diff --git a/src/main/java/com/gunshi/project/xyt/validate/markers/Update.java b/src/main/java/com/gunshi/project/xyt/validate/markers/Update.java new file mode 100644 index 0000000..c18fed3 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/validate/markers/Update.java @@ -0,0 +1,11 @@ +package com.gunshi.project.xyt.validate.markers; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +public interface Update { +} diff --git a/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java b/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java new file mode 100644 index 0000000..af7b057 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java @@ -0,0 +1,63 @@ +package com.gunshi.project.xyt.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gunshi.core.dateformat.DateFormatString; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.Date; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-24 + */ +public class ServiceResourceMonitorVo { + //region ServiceResourceMonitorR + @Schema(description = "id") + @TableId("ID") + private Long id; + + @Schema(description = "服务资源id") + @TableField("SR_ID") + private String srId; + + @Schema(description = "最近数据时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + @TableField("LAST_CHANGE_TM") + private Date lastChangeTm; + + @Schema(description = "共享数据(条)") + @TableField("RECORD_COUNT") + private Long recordCount; + + @Schema(description = "共享站点数量") + @TableField("ST_COUNT") + private Integer stCount; + + @Schema(description = "今日共享数据(条)") + @TableField("TODAY_COUNT") + private Long todayCount; + + @Schema(description = "本周共享数据(条)") + @TableField("WEEKLY_COUNT") + private Long weeklyCount; + + @Schema(description = "本月共享数据(条)") + @TableField("MONTHLY_COUNT") + private Long monthlyCount; + + @Schema(description = "本年共享数据(条)") + @TableField("YEARLY_COUNT") + private Long yearlyCount; + //endregion + + //region ServiceResource + @Schema(description = "服务名称") + @TableField("NAME") + private String name; + //endregion +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ebfff32..b5a8433 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -56,3 +56,6 @@ gunshi: username: gunshi_logger password: 1234567a +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/src/main/resources/sql/ServiceResource.sql b/src/main/resources/sql/ServiceResource.sql new file mode 100644 index 0000000..167433a --- /dev/null +++ b/src/main/resources/sql/ServiceResource.sql @@ -0,0 +1,168 @@ +/* + Navicat Premium Data Transfer + + Source Server : dev-mssql + Source Server Type : SQL Server + Source Server Version : 16001000 + Source Host : 10.0.41.115:1433 + Source Catalog : xyt + Source Schema : dbo + + Target Server Type : SQL Server + Target Server Version : 16001000 + File Encoding : 65001 + + Date: 24/01/2024 16:12:30 +*/ + + +-- ---------------------------- +-- Table structure for SERVICE_RESOURCE +-- ---------------------------- +IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[SERVICE_RESOURCE]') AND type IN ('U')) + DROP TABLE [dbo].[SERVICE_RESOURCE] +GO + +CREATE TABLE [dbo].[SERVICE_RESOURCE] ( + [ID] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [NAME] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [DESCRIPTION] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [SERVICE_TYPE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [URL] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [PORT] int NULL, + [PROVIDER] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [TARGET_TABLE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [TARGET_TM_FIELD] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [ROUTE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [CONTACT] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [PHONE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, + [REGISTER_DATE] datetime NULL, + [UPDATE_TM] datetime NULL, + [ENABLE] int NULL, + [STATUS] int NULL, + [LAST_DATA_TM] datetime NULL +) +GO + +ALTER TABLE [dbo].[SERVICE_RESOURCE] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'id', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'ID' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'服务名称', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'NAME' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'服务描述', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'DESCRIPTION' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'服务类型', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'SERVICE_TYPE' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'服务地址', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'URL' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'服务端口', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'PORT' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'服务提供者', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'PROVIDER' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'目标表', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'TARGET_TABLE' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'目标时间依据字段', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'TARGET_TM_FIELD' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'路由', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'ROUTE' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'联系人', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'CONTACT' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'联系电话', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'PHONE' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'注册日期', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'REGISTER_DATE' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'修改日期', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'UPDATE_TM' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'启用, 0-停用，1-启用', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'ENABLE' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'状态, 0-不在线/异常，1-在线/正常', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'STATUS' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'最近数据时间', +'SCHEMA', N'dbo', +'TABLE', N'SERVICE_RESOURCE', +'COLUMN', N'LAST_DATA_TM' +GO + diff --git a/src/test/java/com/gunshi/project/xyt/TestMain.java b/src/test/java/com/gunshi/project/xyt/TestMain.java new file mode 100644 index 0000000..8911183 --- /dev/null +++ b/src/test/java/com/gunshi/project/xyt/TestMain.java @@ -0,0 +1,16 @@ +package com.gunshi.project.xyt; + +import com.gunshi.core.annotation.GunShiApplication; +import org.mybatis.spring.annotation.MapperScan; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +@GunShiApplication +@MapperScan(basePackages = {"com.gunshi.**.mapper", "com.gunshi.**.model"}) +public class TestMain { +} diff --git a/src/test/java/com/gunshi/project/xyt/controller/TestController.java b/src/test/java/com/gunshi/project/xyt/controller/TestController.java new file mode 100644 index 0000000..7e14c48 --- /dev/null +++ b/src/test/java/com/gunshi/project/xyt/controller/TestController.java @@ -0,0 +1,23 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.logging.access.annotation.LoginLogging; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-23 + */ +@RestController +@RequestMapping("/test") +public class TestController { + @LoginLogging + @GetMapping("/ping") + public String pong() { + return "pong"; + } +} diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 24dfed1..ebfff32 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -28,6 +28,13 @@ spring: gunshi: core: appName: project-xyt + file: + key: test.by_lyf.tmp + secret: xPXPAb63FphkGkPU0ZZkNIXmDzjDVeF3PBH6ZEKw + endpoint: http://223.75.53.141:9102 + publicBucket: test.by-lyf.tmp + loginBucket: test.by-lyf.tmp + privateBucket: test.by-lyf.tmp access: logging: enabled: true @@ -48,10 +55,4 @@ gunshi: database: gunshi-logging username: gunshi_logger password: 1234567a - file: - key: test.by_lyf.tmp - secret: xPXPAb63FphkGkPU0ZZkNIXmDzjDVeF3PBH6ZEKw - endpoint: http://223.75.53.141:9102 - publicBucket: test.by-lyf.tmp - loginBucket: test.by-lyf.tmp - privateBucket: test.by-lyf.tmp \ No newline at end of file + From dcfa66b12eab8ac32b9abb837a8537ee0114e8e8 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Wed, 24 Jan 2024 17:14:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=A2=9E=E5=8A=A0BZ?= =?UTF-8?q?=E5=89=8D=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; From fd148556737b9dc2958aba014a14a1ee5a51b7da Mon Sep 17 00:00:00 2001 From: lyf66 Date: Wed, 24 Jan 2024 17:29:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=A2=9E=E5=8A=A0BZ?= =?UTF-8?q?=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...lInfoController.java => BzProtocolInfoController.java} | 2 +- ...ceController.java => BzServiceResourceController.java} | 8 ++++---- .../xyt/mapper/BzServiceResourceMonitorRMapper.java | 4 ++-- .../xyt/service/BzServiceResourceMonitorRService.java | 4 ++-- ...urceMonitorVo.java => BzServiceResourceMonitorVo.java} | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/com/gunshi/project/xyt/controller/{ProtocolInfoController.java => BzProtocolInfoController.java} (98%) rename src/main/java/com/gunshi/project/xyt/controller/{ServiceResourceController.java => BzServiceResourceController.java} (94%) rename src/main/java/com/gunshi/project/xyt/vo/{ServiceResourceMonitorVo.java => BzServiceResourceMonitorVo.java} (97%) diff --git a/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java similarity index 98% rename from src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java rename to src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java index 03e8101..fbd5ba2 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java @@ -25,7 +25,7 @@ import java.util.Date; @RestController @RequestMapping("/protocolInfo") @Tag(name = "协议信息") -public class ProtocolInfoController { +public class BzProtocolInfoController { @Autowired private BzProtocolInfoAutoDao dao; diff --git a/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java similarity index 94% rename from src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java rename to src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java index 58ce3cc..6baaaed 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java @@ -15,7 +15,7 @@ import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.QueryPage; import com.gunshi.project.xyt.validate.markers.QueryTimeRange; import com.gunshi.project.xyt.validate.markers.Update; -import com.gunshi.project.xyt.vo.ServiceResourceMonitorVo; +import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +34,7 @@ import java.util.Date; @RestController @RequestMapping("/serviceResource") @Tag(name = "服务资源及监控") -public class ServiceResourceController { +public class BzServiceResourceController { @Autowired private BzServiceResourceAutoDao serviceResourceDao; @@ -87,10 +87,10 @@ public class ServiceResourceController { } @PostMapping("/monitor/page") - public R> pageMonitorR( + public R> pageMonitorR( @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so ) { - Page page = serviceMonitorService.page(so.getPageSo().toPage(), so); + Page page = serviceMonitorService.page(so.getPageSo().toPage(), so); return R.ok(page); } diff --git a/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java index 6c5fe6e..5173a19 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java @@ -2,7 +2,7 @@ package com.gunshi.project.xyt.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.so.BzServiceResourceSo; -import com.gunshi.project.xyt.vo.ServiceResourceMonitorVo; +import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -32,5 +32,5 @@ public interface BzServiceResourceMonitorRMapper { """) - Page page(@Param("page") Page page,@Param("so") BzServiceResourceSo so); + Page page(@Param("page") Page page, @Param("so") BzServiceResourceSo so); } diff --git a/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java b/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java index 5e22b99..473b190 100644 --- a/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java @@ -8,7 +8,7 @@ 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 com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,7 +34,7 @@ public class BzServiceResourceMonitorRService { @Autowired private BzServiceResourceMonitorRMapper serviceMonitorMapper; - public Page page(Page page, BzServiceResourceSo so) { + public Page page(Page page, BzServiceResourceSo so) { return serviceMonitorMapper.page(page, so); } diff --git a/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java b/src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java similarity index 97% rename from src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java rename to src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java index fdc2555..93944cd 100644 --- a/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java +++ b/src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java @@ -15,7 +15,7 @@ import java.util.Date; * @version 1.0.0 * @since 2024-01-24 */ -public class ServiceResourceMonitorVo { +public class BzServiceResourceMonitorVo { //region BzServiceResourceMonitorR @Schema(description = "id") @TableId("ID") From 43bbcd0035406efc63d8cf3c9c383f6f76729d01 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Wed, 24 Jan 2024 17:14:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E5=A2=9E=E5=8A=A0BZ?= =?UTF-8?q?=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ler.java => BzProtocolInfoController.java} | 18 ++--- ....java => BzServiceResourceController.java} | 68 +++++++++---------- ...a => BzServiceResourceMonitorRMapper.java} | 14 ++-- ...{ProtocolInfo.java => BzProtocolInfo.java} | 4 +- ...ceResource.java => BzServiceResource.java} | 4 +- ...rR.java => BzServiceResourceMonitorR.java} | 4 +- ...ceType.java => BzServiceResourceType.java} | 4 +- ... => BzServiceResourceMonitorRService.java} | 35 +++++----- .../xyt/service/ProtocolInfoService.java | 32 ++++----- ...tocolInfoSo.java => BzProtocolInfoSo.java} | 2 +- ...sourceSo.java => BzServiceResourceSo.java} | 2 +- ...peSo.java => BzServiceResourceTypeSo.java} | 4 +- ...o.java => BzServiceResourceMonitorVo.java} | 6 +- 13 files changed, 97 insertions(+), 100 deletions(-) rename src/main/java/com/gunshi/project/xyt/controller/{ProtocolInfoController.java => BzProtocolInfoController.java} (77%) rename src/main/java/com/gunshi/project/xyt/controller/{ServiceResourceController.java => BzServiceResourceController.java} (57%) rename src/main/java/com/gunshi/project/xyt/mapper/{ServiceResourceMonitorRMapper.java => BzServiceResourceMonitorRMapper.java} (64%) 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} (52%) 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%) rename src/main/java/com/gunshi/project/xyt/vo/{ServiceResourceMonitorVo.java => BzServiceResourceMonitorVo.java} (93%) diff --git a/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java similarity index 77% rename from src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java rename to src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java index b675a41..fbd5ba2 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ProtocolInfoController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.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; @@ -25,15 +25,15 @@ import java.util.Date; @RestController @RequestMapping("/protocolInfo") @Tag(name = "协议信息") -public class ProtocolInfoController { +public class BzProtocolInfoController { @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/BzServiceResourceController.java similarity index 57% rename from src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java rename to src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java index 995ad4e..6baaaed 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ServiceResourceController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java @@ -4,18 +4,18 @@ 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; import com.gunshi.project.xyt.validate.markers.Update; -import com.gunshi.project.xyt.vo.ServiceResourceMonitorVo; +import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -34,19 +34,19 @@ import java.util.Date; @RestController @RequestMapping("/serviceResource") @Tag(name = "服务资源及监控") -public class ServiceResourceController { +public class BzServiceResourceController { @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 + public R> pageMonitorR( + @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so ) { - Page page = serviceMonitorService.page(so.getPageSo().toPage(), 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 64% 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..5173a19 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.vo.ServiceResourceMonitorVo; +import com.gunshi.project.xyt.so.BzServiceResourceSo; +import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; 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 52% 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..473b190 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ServiceResourceMonitorRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java @@ -1,15 +1,14 @@ 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.vo.ServiceResourceMonitorVo; +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.BzServiceResourceMonitorVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -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/BzServiceResourceMonitorVo.java similarity index 93% rename from src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java rename to src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java index af7b057..93944cd 100644 --- a/src/main/java/com/gunshi/project/xyt/vo/ServiceResourceMonitorVo.java +++ b/src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java @@ -15,8 +15,8 @@ import java.util.Date; * @version 1.0.0 * @since 2024-01-24 */ -public class ServiceResourceMonitorVo { - //region ServiceResourceMonitorR +public class BzServiceResourceMonitorVo { + //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; From c13a4ace55d547a40022b96cf975f1e8e3983a74 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Wed, 24 Jan 2024 17:14:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=BB=99=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0openapi=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 13 ------------- .../xyt/controller/BzProtocolInfoController.java | 8 +++++++- .../xyt/controller/BzServiceResourceController.java | 12 +++++++++++- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index f05decc..818ec7c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,19 +34,6 @@ org.apache.maven.plugins maven-dependency-plugin - - - copy-lib - - copy-dependencies - - - false - false - runtime - - - diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java index fbd5ba2..df762e5 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java @@ -8,6 +8,7 @@ import com.gunshi.project.xyt.service.ProtocolInfoService; 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.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -24,7 +25,7 @@ import java.util.Date; */ @RestController @RequestMapping("/protocolInfo") -@Tag(name = "协议信息") +@Tag(name = "系统管理-统一接收-协议管理") public class BzProtocolInfoController { @Autowired private BzProtocolInfoAutoDao dao; @@ -32,6 +33,7 @@ public class BzProtocolInfoController { @Autowired private ProtocolInfoService service; + @Operation(summary = "新增协议信息") @PostMapping("/save") public R save(@Validated({Insert.class}) @RequestBody BzProtocolInfo entity) { // todo 无论是数据库设置默认值为GETDATE()还是使用注解fill = FieldFill.INSERT都不能自动插入当前时间 @@ -40,21 +42,25 @@ public class BzProtocolInfoController { return R.ok(dao.save(entity)); } + @Operation(summary = "更新协议信息") @PostMapping("/update") public R update(@Validated({Update.class}) @RequestBody BzProtocolInfo entity) { return R.ok(dao.updateById(entity)); } + @Operation(summary = "删除协议信息") @GetMapping("/delete/{id}") public R delete(@PathVariable String id) { return R.ok(dao.removeById(id)); } + @Operation(summary = "按id查询接口") @GetMapping("/get/{id}") public R getById(@PathVariable("id") String id) { return R.ok(dao.getById(id)); } + @Operation(summary = "分页查询接口") @PostMapping("/page") public R> page(@Validated @RequestBody BzProtocolInfoSo so) { return R.ok(service.page(so)); diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java index 6baaaed..58074a9 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java @@ -16,6 +16,7 @@ import com.gunshi.project.xyt.validate.markers.QueryPage; import com.gunshi.project.xyt.validate.markers.QueryTimeRange; import com.gunshi.project.xyt.validate.markers.Update; import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +34,7 @@ import java.util.Date; */ @RestController @RequestMapping("/serviceResource") -@Tag(name = "服务资源及监控") +@Tag(name = "系统管理-数据共享服务-服务资源及监控") public class BzServiceResourceController { @Autowired @@ -45,6 +46,7 @@ public class BzServiceResourceController { @Autowired private BzServiceResourceTypeAutoDao serviceTypeDao; + @Operation(summary = "新增服务资源") @PostMapping("/save") public R save(@Validated(Insert.class) @RequestBody BzServiceResource entity) { entity.setId(IdWorker.getIdStr()); @@ -53,6 +55,7 @@ public class BzServiceResourceController { return R.ok(serviceResourceDao.save(entity)); } + @Operation(summary = "更新服务资源") @PostMapping("/update") public R update(@Validated(Update.class) @RequestBody BzServiceResource entity) { BzServiceResource byId = serviceResourceDao.getById(entity.getId()); @@ -64,11 +67,13 @@ public class BzServiceResourceController { return R.ok(serviceResourceDao.updateById(entity)); } + @Operation(summary = "删除服务资源") @GetMapping("/delete/{id}") public R delete(@PathVariable("id") String id) { return R.ok(serviceMonitorService.removeById(id)); } + @Operation(summary = "分页查询服务资源") @PostMapping("/page") public R> page( @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so @@ -86,6 +91,7 @@ public class BzServiceResourceController { return R.ok(page); } + @Operation(summary = "分页查询服务资源监控") @PostMapping("/monitor/page") public R> pageMonitorR( @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so @@ -94,22 +100,26 @@ public class BzServiceResourceController { return R.ok(page); } + @Operation(summary = "新增服务资源类型") @PostMapping("/type/save") public R saveType(@Validated(Insert.class) @RequestBody BzServiceResourceType entity) { entity.setId(IdWorker.getIdStr()); return R.ok(serviceTypeDao.save(entity)); } + @Operation(summary = "更新服务资源类型") @PostMapping("/type/update") public R updateType(@Validated(Update.class) @RequestBody BzServiceResourceType entity) { return R.ok(serviceTypeDao.updateById(entity)); } + @Operation(summary = "删除服务资源类型") @GetMapping("/type/delete/{id}") public R deleteType(@PathVariable("id") String id) { return R.ok(serviceTypeDao.removeById(id)); } + @Operation(summary = "分页查询服务资源类型") @PostMapping("/type/page") public R> pageType( @Validated({QueryPage.class}) @RequestBody BzServiceResourceTypeSo so