From ace820480ab2399929992f75c5fdf4042a0a5350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Sun, 7 Jul 2024 16:14:37 +0800 Subject: [PATCH] feat: DeviceTypeVerLog --- .../bellmann/common/enums/TaskStatusEnum.java | 24 ++++++++++ .../DeviceTypeVerLogController.java | 38 +++++++++++++++ .../converter/DeviceTypeVerLogConverter.java | 26 ++++++++++ .../mapper/DeviceTypeVerLogMapper.java | 18 +++++++ .../model/entity/DeviceTypeVerLog.java | 48 +++++++++++++++++++ .../bellmann/model/vo/DeviceTypeVerLogVO.java | 36 ++++++++++++++ .../service/DeviceTypeVerLogService.java | 18 +++++++ .../impl/DeviceTypeVerLogServiceImpl.java | 40 ++++++++++++++++ .../mapper/DeviceTypeVerLogMapper.xml | 25 ++++++++++ 9 files changed, 273 insertions(+) create mode 100644 src/main/java/com/bellmann/common/enums/TaskStatusEnum.java create mode 100644 src/main/java/com/bellmann/controller/DeviceTypeVerLogController.java create mode 100644 src/main/java/com/bellmann/converter/DeviceTypeVerLogConverter.java create mode 100644 src/main/java/com/bellmann/mapper/DeviceTypeVerLogMapper.java create mode 100644 src/main/java/com/bellmann/model/entity/DeviceTypeVerLog.java create mode 100644 src/main/java/com/bellmann/model/vo/DeviceTypeVerLogVO.java create mode 100644 src/main/java/com/bellmann/service/DeviceTypeVerLogService.java create mode 100644 src/main/java/com/bellmann/service/impl/DeviceTypeVerLogServiceImpl.java create mode 100644 src/main/resources/mapper/DeviceTypeVerLogMapper.xml diff --git a/src/main/java/com/bellmann/common/enums/TaskStatusEnum.java b/src/main/java/com/bellmann/common/enums/TaskStatusEnum.java new file mode 100644 index 0000000..e745a71 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/TaskStatusEnum.java @@ -0,0 +1,24 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum TaskStatusEnum implements IBaseEnum { + + FAILED(0,"失败"), + + SUCCESSFUL(1,"成功"), + + ; + + @Getter + private Integer value; + + @Getter + private String label; + + TaskStatusEnum(Integer value, String label){ + this.label = label; + this.value = value; + } +} diff --git a/src/main/java/com/bellmann/controller/DeviceTypeVerLogController.java b/src/main/java/com/bellmann/controller/DeviceTypeVerLogController.java new file mode 100644 index 0000000..e058c1d --- /dev/null +++ b/src/main/java/com/bellmann/controller/DeviceTypeVerLogController.java @@ -0,0 +1,38 @@ +package com.bellmann.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bellmann.common.base.BasePageQuery; +import com.bellmann.common.result.PageResult; +import com.bellmann.model.vo.DeviceTypeVerLogVO; +import com.bellmann.service.DeviceTypeVerLogService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + *

+ * 前端控制器 + *

+ * + * @author 李小林 + * @since 2024-07-07 + */ +@Tag(name = "24.SOAP包日志") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/device-type-ver-log/v1") +public class DeviceTypeVerLogController { + + private final DeviceTypeVerLogService deviceTypeVerLogService; + + + @PostMapping("/page/{devId}") + @Operation(summary = "page") + public PageResult pageData(@PathVariable Long devId, @RequestBody BasePageQuery query){ + Page page = deviceTypeVerLogService.pageData(query,devId); + return PageResult.success(page); + } +} + diff --git a/src/main/java/com/bellmann/converter/DeviceTypeVerLogConverter.java b/src/main/java/com/bellmann/converter/DeviceTypeVerLogConverter.java new file mode 100644 index 0000000..3ce325a --- /dev/null +++ b/src/main/java/com/bellmann/converter/DeviceTypeVerLogConverter.java @@ -0,0 +1,26 @@ +package com.bellmann.converter; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bellmann.model.entity.DeviceTypeVerLog; +import com.bellmann.model.vo.DeviceTypeVerLogVO; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; + +/** + * 用户对象转换器 + * + * + * @since 2022/6/8 + */ +@Mapper(componentModel = "spring") +public interface DeviceTypeVerLogConverter { + + @Mappings({ + @Mapping(target = "taskStatus", expression = "java(com.bellmann.common.base.IBaseEnum.getLabelByValue(entity.getTaskStatus(), com.bellmann.common.enums.TaskStatusEnum.class))"), + }) + DeviceTypeVerLogVO entityPage2VoPage(DeviceTypeVerLog entity); + + Page entityPage2VoPage(Page entityPage); + +} diff --git a/src/main/java/com/bellmann/mapper/DeviceTypeVerLogMapper.java b/src/main/java/com/bellmann/mapper/DeviceTypeVerLogMapper.java new file mode 100644 index 0000000..ad19310 --- /dev/null +++ b/src/main/java/com/bellmann/mapper/DeviceTypeVerLogMapper.java @@ -0,0 +1,18 @@ +package com.bellmann.mapper; + +import com.bellmann.model.entity.DeviceTypeVerLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 李小林 + * @since 2024-07-07 + */ +@Mapper +public interface DeviceTypeVerLogMapper extends BaseMapper { + +} diff --git a/src/main/java/com/bellmann/model/entity/DeviceTypeVerLog.java b/src/main/java/com/bellmann/model/entity/DeviceTypeVerLog.java new file mode 100644 index 0000000..0d553da --- /dev/null +++ b/src/main/java/com/bellmann/model/entity/DeviceTypeVerLog.java @@ -0,0 +1,48 @@ +package com.bellmann.model.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * + *

+ * + * @author 李小林 + * @since 2024-07-07 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("itms_device_type_ver_log") +public class DeviceTypeVerLog implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long logid; + + private String taskName; + + private String loId; + + private String devSno; + + private Date startTime; + + private Date endTime; + + private Integer taskStatus; + + private Long devId; + + private String serialId; + + private Integer enevtType; + + private Integer evevtStatus; + + +} diff --git a/src/main/java/com/bellmann/model/vo/DeviceTypeVerLogVO.java b/src/main/java/com/bellmann/model/vo/DeviceTypeVerLogVO.java new file mode 100644 index 0000000..093ff21 --- /dev/null +++ b/src/main/java/com/bellmann/model/vo/DeviceTypeVerLogVO.java @@ -0,0 +1,36 @@ +package com.bellmann.model.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * + *

+ * + * @author 李小林 + * @since 2024-07-07 + */ +@Data +@Schema(description = "设备软件版本对外接口能力调用信息视图") +public class DeviceTypeVerLogVO{ + + private Long logid; + + private String taskName; + + private String loId; + + private String devSno; + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + private Date startTime; + + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + private Date endTime; + + private String taskStatus; + +} diff --git a/src/main/java/com/bellmann/service/DeviceTypeVerLogService.java b/src/main/java/com/bellmann/service/DeviceTypeVerLogService.java new file mode 100644 index 0000000..c2ad2ad --- /dev/null +++ b/src/main/java/com/bellmann/service/DeviceTypeVerLogService.java @@ -0,0 +1,18 @@ +package com.bellmann.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bellmann.common.base.BasePageQuery; +import com.bellmann.model.vo.DeviceTypeVerLogVO; + +/** + *

+ * 服务类 + *

+ * + * @author 李小林 + * @since 2024-07-07 + */ +public interface DeviceTypeVerLogService { + + Page pageData(BasePageQuery query, Long devId); +} diff --git a/src/main/java/com/bellmann/service/impl/DeviceTypeVerLogServiceImpl.java b/src/main/java/com/bellmann/service/impl/DeviceTypeVerLogServiceImpl.java new file mode 100644 index 0000000..4a0f8d2 --- /dev/null +++ b/src/main/java/com/bellmann/service/impl/DeviceTypeVerLogServiceImpl.java @@ -0,0 +1,40 @@ +package com.bellmann.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bellmann.common.base.BasePageQuery; +import com.bellmann.converter.DeviceTypeVerLogConverter; +import com.bellmann.mapper.DeviceTypeVerLogMapper; +import com.bellmann.model.entity.DeviceTypeVerLog; +import com.bellmann.model.vo.DeviceTypeVerLogVO; +import com.bellmann.service.DeviceTypeVerLogService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 李小林 + * @since 2024-07-07 + */ +@Service +@RequiredArgsConstructor +public class DeviceTypeVerLogServiceImpl implements DeviceTypeVerLogService { + + private final DeviceTypeVerLogMapper deviceTypeVerLogMapper; + + private final DeviceTypeVerLogConverter deviceTypeVerLogConverter; + @Override + public Page pageData(BasePageQuery query, Long devId) { + int pageNum = query.getPageNum(); + int pageSize = query.getPageSize(); + Page page = new Page<>(pageNum,pageSize); + Page entityPage = deviceTypeVerLogMapper.selectPage(page, new QueryWrapper() + .select("logid", "task_name", "lo_id", "dev_sno", "start_time", "end_time", "task_status") + .eq("dev_id", devId) + ); + return deviceTypeVerLogConverter.entityPage2VoPage(entityPage); + } +} diff --git a/src/main/resources/mapper/DeviceTypeVerLogMapper.xml b/src/main/resources/mapper/DeviceTypeVerLogMapper.xml new file mode 100644 index 0000000..e80994c --- /dev/null +++ b/src/main/resources/mapper/DeviceTypeVerLogMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + logid, task_name, lo_id, dev_sno, start_time, end_time, task_status, dev_id, serial_id, enevt_type, evevt_status + + +