diff --git a/core/src/main/java/com/dite/znpt/domain/entity/DeptEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/DeptEntity.java index f523db9..eed55cf 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/DeptEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/DeptEntity.java @@ -21,7 +21,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @TableName("dept") -@ApiModel(value="DeptEntity对象", description="表") +@ApiModel(value="DeptEntity对象", description="部门信息表") public class DeptEntity extends AuditableEntity implements Serializable { @Serial private static final long serialVersionUID = -6471015140726790051L; diff --git a/core/src/main/java/com/dite/znpt/domain/entity/EquipmentEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/EquipmentEntity.java new file mode 100644 index 0000000..3d1657d --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/entity/EquipmentEntity.java @@ -0,0 +1,52 @@ +package com.dite.znpt.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.dite.znpt.domain.AuditableEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:26 + * @description + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("equipment") +@ApiModel(value="EquipmentEntity对象", description="设备信息表") +public class EquipmentEntity extends AuditableEntity implements Serializable { + @Serial + private static final long serialVersionUID = -6665040704562461286L; + + @ApiModelProperty("设备id") + @TableId(type = IdType.ASSIGN_ID) + private String equipmentId; + + @ApiModelProperty("设备名称") + private String equipmentName; + + @ApiModelProperty("设备型号") + private String equipmentModel; + + @ApiModelProperty("设备编码") + private String equipmentCode; + + @ApiModelProperty("设备类型") + private String equipmentType; + + @ApiModelProperty("设备状态，0-空闲中，1-使用，3-保养中，4-维修中，5-已报废") + private String equipmentStatus; + + @ApiModelProperty("设备序列号") + private String equipmentSn; + + @ApiModelProperty("当前使用记录id") + private String useRecordId; +} diff --git a/core/src/main/java/com/dite/znpt/domain/entity/EquipmentUseRecordEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/EquipmentUseRecordEntity.java new file mode 100644 index 0000000..9611f0f --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/entity/EquipmentUseRecordEntity.java @@ -0,0 +1,50 @@ +package com.dite.znpt.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.dite.znpt.domain.AuditableEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:33 + * @description + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("equipment_use_record") +@ApiModel(value="EquipmentUseRecordEntity对象", description="设备使用记录表") +public class EquipmentUseRecordEntity extends AuditableEntity implements Serializable { + @Serial + private static final long serialVersionUID = -812107257694322222L; + + @ApiModelProperty("设备使用记录id") + @TableId(type = IdType.ASSIGN_UUID) + private String recordId; + + @ApiModelProperty("设备id") + private String equipmentId; + + @ApiModelProperty("用户id") + private String userId; + + @ApiModelProperty("项目id") + private String projectId; + + @ApiModelProperty("操作类型：0-借用，1-归还") + private String operateType; + + @ApiModelProperty("操作时间") + private LocalDateTime operateTime; + + @ApiModelProperty("备注") + private String remark; +} diff --git a/core/src/main/java/com/dite/znpt/domain/vo/EquipmentListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentListReq.java new file mode 100644 index 0000000..e5e1fe6 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentListReq.java @@ -0,0 +1,32 @@ +package com.dite.znpt.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:43 + * @description + */ +@Data +@ApiModel("设备信息列表请求") +public class EquipmentListReq implements Serializable { + @Serial + private static final long serialVersionUID = 2407208576252291143L; + + @ApiModelProperty("设备名称") + private String equipmentName; + + @ApiModelProperty("设备编码") + private String equipmentCode; + + @ApiModelProperty("设备类型") + private String equipmentType; + + @ApiModelProperty("设备状态，0-空闲中，1-使用，3-保养中，4-维修中，5-已报废") + private String equipmentStatus; +} diff --git a/core/src/main/java/com/dite/znpt/domain/vo/EquipmentReq.java b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentReq.java new file mode 100644 index 0000000..2a742d6 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentReq.java @@ -0,0 +1,46 @@ +package com.dite.znpt.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serial; +import java.io.Serializable; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:43 + * @description + */ +@Data +@ApiModel("设备信息请求对象") +public class EquipmentReq implements Serializable { + @Serial + private static final long serialVersionUID = -1065926558169771082L; + + @ApiModelProperty("设备名称") + @NotBlank(message = "设备名称不能为空") + @Size(max = 100, message = "设备名称长度不能超过100个字") + private String equipmentName; + + @ApiModelProperty("设备编码") + @NotBlank(message = "设备编码不能为空") + @Size(max = 50, message = "设备编码长度不能超过50个字") + private String equipmentCode; + + @ApiModelProperty("设备类型") + @NotBlank(message = "设备类型不能为空") + private String equipmentType; + + @ApiModelProperty("设备型号") + @NotBlank(message = "设备型号不能为空") + @Size(max = 50, message = "设备型号长度不能超过50个字") + private String equipmentModel; + + @ApiModelProperty("设备SN") + @NotBlank(message = "设备SN不能为空") + @Size(max = 50, message = "设备SN长度不能超过50个字") + private String equipmentSn; +} diff --git a/core/src/main/java/com/dite/znpt/domain/vo/EquipmentResp.java b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentResp.java new file mode 100644 index 0000000..b113bb2 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentResp.java @@ -0,0 +1,41 @@ +package com.dite.znpt.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:43 + * @description + */ +@Data +@ApiModel("设备信息响应") +public class EquipmentResp implements Serializable { + @Serial + private static final long serialVersionUID = 310447373498622767L; + + @ApiModelProperty("设备ID") + private String equipmentId; + + @ApiModelProperty("设备名称") + private String equipmentName; + + @ApiModelProperty("设备编码") + private String equipmentCode; + + @ApiModelProperty("设备类型") + private String equipmentType; + + @ApiModelProperty("设备型号") + private String equipmentModel; + + @ApiModelProperty("设备SN") + private String equipmentSn; + + @ApiModelProperty("设备状态，0-空闲中，1-使用，3-保养中，4-维修中，5-已报废") + private String equipmentStatus; +} diff --git a/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordListReq.java new file mode 100644 index 0000000..4111a3a --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordListReq.java @@ -0,0 +1,37 @@ +package com.dite.znpt.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:44 + * @description + */ +@Data +@ApiModel("设备使用记录列表请求") +public class EquipmentUseRecordListReq implements Serializable { + @Serial + private static final long serialVersionUID = -7403000780666506211L; + + @ApiModelProperty("设备ID") + private String equipmentId; + + @ApiModelProperty("用户ID") + private String userId; + + @ApiModelProperty("项目ID") + private String projectId; + + @ApiModelProperty("操作类型：0-借用，1-归还") + private String operateType; + + @ApiModelProperty("操作时间") + private LocalDateTime operateTime; + +} diff --git a/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordReq.java b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordReq.java new file mode 100644 index 0000000..a074095 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordReq.java @@ -0,0 +1,42 @@ +package com.dite.znpt.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serial; +import java.io.Serializable; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:44 + * @description + */ +@Data +@ApiModel("设备使用记录请求") +public class EquipmentUseRecordReq implements Serializable { + @Serial + private static final long serialVersionUID = -6615316964696995428L; + + @ApiModelProperty("设备ID") + @NotBlank(message = "设备ID不能为空") + private String equipmentId; + + @ApiModelProperty("用户ID") + @NotBlank(message = "用户ID不能为空") + private String userId; + + @ApiModelProperty("项目ID") + @NotBlank(message = "项目ID不能为空") + private String projectId; + + @ApiModelProperty("操作类型：0-借用，1-归还") + @NotBlank(message = "操作类型不能为空") + private String operateType; + + @Size(max = 200, message = "备注长度不能超过200") + @ApiModelProperty("备注") + private String remark; +} diff --git a/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordResp.java b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordResp.java new file mode 100644 index 0000000..63e1a6a --- /dev/null +++ b/core/src/main/java/com/dite/znpt/domain/vo/EquipmentUseRecordResp.java @@ -0,0 +1,60 @@ +package com.dite.znpt.domain.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:44 + * @description + */ +@Data +@ApiModel("设备使用记录响应") +public class EquipmentUseRecordResp implements Serializable { + @Serial + private static final long serialVersionUID = -6673311877391209692L; + + @ApiModelProperty("记录ID") + private String recordId; + + @ApiModelProperty("设备ID") + private String equipmentId; + + @ApiModelProperty("设备名称") + private String equipmentName; + + @ApiModelProperty("设备编码") + private String equipmentCode; + + @ApiModelProperty("设备类型") + private String equipmentType; + + @ApiModelProperty("设备型号") + private String equipmentModel; + + @ApiModelProperty("设备SN") + private String equipmentSn; + + @ApiModelProperty("用户ID") + private String userId; + + @ApiModelProperty("用户姓名") + private String name; + + @ApiModelProperty("项目ID") + private String projectId; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("操作类型：0-借用，1-归还") + private String operateType; + + @ApiModelProperty("操作时间") + private LocalDateTime operateTime; +} diff --git a/core/src/main/java/com/dite/znpt/mapper/EquipmentMapper.java b/core/src/main/java/com/dite/znpt/mapper/EquipmentMapper.java new file mode 100644 index 0000000..e3ca8fc --- /dev/null +++ b/core/src/main/java/com/dite/znpt/mapper/EquipmentMapper.java @@ -0,0 +1,12 @@ +package com.dite.znpt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dite.znpt.domain.entity.EquipmentEntity; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:38 + * @description + */ +public interface EquipmentMapper extends BaseMapper { +} diff --git a/core/src/main/java/com/dite/znpt/mapper/EquipmentUseRecordMapper.java b/core/src/main/java/com/dite/znpt/mapper/EquipmentUseRecordMapper.java new file mode 100644 index 0000000..d6f2bb8 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/mapper/EquipmentUseRecordMapper.java @@ -0,0 +1,12 @@ +package com.dite.znpt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dite.znpt.domain.entity.EquipmentUseRecordEntity; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:38 + * @description + */ +public interface EquipmentUseRecordMapper extends BaseMapper { +} diff --git a/core/src/main/java/com/dite/znpt/service/EquipmentService.java b/core/src/main/java/com/dite/znpt/service/EquipmentService.java new file mode 100644 index 0000000..7d37550 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/service/EquipmentService.java @@ -0,0 +1,12 @@ +package com.dite.znpt.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.dite.znpt.domain.entity.EquipmentEntity; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:39 + * @description + */ +public interface EquipmentService extends IService { +} diff --git a/core/src/main/java/com/dite/znpt/service/EquipmentUseRecordService.java b/core/src/main/java/com/dite/znpt/service/EquipmentUseRecordService.java new file mode 100644 index 0000000..2c59514 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/service/EquipmentUseRecordService.java @@ -0,0 +1,12 @@ +package com.dite.znpt.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.dite.znpt.domain.entity.EquipmentUseRecordEntity; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:40 + * @description + */ +public interface EquipmentUseRecordService extends IService { +} diff --git a/core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java new file mode 100644 index 0000000..ef0b1a2 --- /dev/null +++ b/core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java @@ -0,0 +1,16 @@ +package com.dite.znpt.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dite.znpt.domain.entity.EquipmentEntity; +import com.dite.znpt.mapper.EquipmentMapper; +import com.dite.znpt.service.EquipmentService; +import org.springframework.stereotype.Service; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:39 + * @description + */ +@Service +public class EquipmentServiceImpl extends ServiceImpl implements EquipmentService { +} diff --git a/core/src/main/java/com/dite/znpt/service/impl/EquipmentUseRecordServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/EquipmentUseRecordServiceImpl.java new file mode 100644 index 0000000..b2ce01f --- /dev/null +++ b/core/src/main/java/com/dite/znpt/service/impl/EquipmentUseRecordServiceImpl.java @@ -0,0 +1,17 @@ +package com.dite.znpt.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dite.znpt.domain.entity.EquipmentUseRecordEntity; +import com.dite.znpt.mapper.EquipmentUseRecordMapper; +import com.dite.znpt.service.EquipmentUseRecordService; +import org.springframework.stereotype.Service; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:40 + * @description + */ +@Service +public class EquipmentUseRecordServiceImpl extends ServiceImpl implements EquipmentUseRecordService { + +} diff --git a/web/src/main/java/com/dite/znpt/web/controller/EquipmentController.java b/web/src/main/java/com/dite/znpt/web/controller/EquipmentController.java new file mode 100644 index 0000000..3ea1abd --- /dev/null +++ b/web/src/main/java/com/dite/znpt/web/controller/EquipmentController.java @@ -0,0 +1,26 @@ +package com.dite.znpt.web.controller; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:41 + * @description + */ +@Api(tags = "设备信息") +@RestController +@RequestMapping("/equipment") +public class EquipmentController { + + @RequestMapping("/list") + public String list() { + return "equipment/list"; + } + + @RequestMapping("/detail") + public String detail() { + return "equipment/detail"; + } +} diff --git a/web/src/main/java/com/dite/znpt/web/controller/EquipmentUseRecordController.java b/web/src/main/java/com/dite/znpt/web/controller/EquipmentUseRecordController.java new file mode 100644 index 0000000..c58c408 --- /dev/null +++ b/web/src/main/java/com/dite/znpt/web/controller/EquipmentUseRecordController.java @@ -0,0 +1,17 @@ +package com.dite.znpt.web.controller; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author Bear.G + * @date 2025/7/23/周三 17:41 + * @description + */ +@Api(tags = "设备使用记录") +@RestController +@RequestMapping("/equipment-use-record") +public class EquipmentUseRecordController { + +}