diff --git a/core/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java index 2b1eb6f..b644d3c 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/CombinedDictEntity.java @@ -12,7 +12,7 @@ import com.alibaba.excel.annotation.ExcelProperty; /** * @author huise23 - * @date 2025/04/11 23:17 + * @date 2025/04/24 13:44 * @Description: 字典表实体类 */ @Data @@ -21,7 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty; @ApiModel(value="CombinedDictEntity对象", description="字典表") public class CombinedDictEntity extends AuditableEntity implements Serializable { - private static final long serialVersionUID = -11768336612800273L; + private static final long serialVersionUID = 839158304342208816L; @ExcelProperty("字典id") @ApiModelProperty("字典id") diff --git a/core/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java index 7d4ab2c..d702e88 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/DefectEntity.java @@ -1,5 +1,6 @@ package com.dite.znpt.domain.entity; +import java.math.BigDecimal; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.*; @@ -12,7 +13,7 @@ import com.alibaba.excel.annotation.ExcelProperty; /** * @author huise23 - * @date 2025/04/11 23:17 + * @date 2025/04/24 13:44 * @Description: 缺陷记录表实体类 */ @Data @@ -21,7 +22,7 @@ import com.alibaba.excel.annotation.ExcelProperty; @ApiModel(value="DefectEntity对象", description="缺陷记录表") public class DefectEntity extends AuditableEntity implements Serializable { - private static final long serialVersionUID = 272430541345740192L; + private static final long serialVersionUID = 721961595098309935L; @ExcelProperty("缺陷id") @ApiModelProperty("缺陷id") @@ -56,12 +57,12 @@ public class DefectEntity extends AuditableEntity implements Serializable { @ExcelProperty("轴向长度(mm)") @ApiModelProperty("轴向长度(mm)") @TableField("axial_length") - private Object axialLength; + private BigDecimal axialLength; @ExcelProperty("弦向长度(mm)") @ApiModelProperty("弦向长度(mm)") @TableField("chord_length") - private Object chordLength; + private BigDecimal chordLength; @ExcelProperty("图片路径") @ApiModelProperty("图片路径") diff --git a/core/src/main/java/com/dite/znpt/domain/entity/PartEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/PartEntity.java index 553d1ae..b257196 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/PartEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/PartEntity.java @@ -35,8 +35,8 @@ public class PartEntity extends AuditableEntity implements Serializable { @ExcelProperty("机组id") @ApiModelProperty("机组id") - @TableField("crew_id") - private String crewId; + @TableField("turbine_id") + private String turbineId; @ExcelProperty("名称") @ApiModelProperty("名称") diff --git a/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java index 23b1c0e..e1a029c 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/TConstructionEntity.java @@ -23,46 +23,57 @@ public class TConstructionEntity extends AuditableEntity implements Serializable private static final long serialVersionUID = 295094962841990277L; + @ExcelProperty("施工id") @ApiModelProperty("施工id") @TableId(value = "construction_id", type = IdType.ASSIGN_ID) private String constructionId; + @ExcelProperty("项目id") @ApiModelProperty("项目id") @TableField("project_id") private String projectId; + @ExcelProperty("机组id") @ApiModelProperty("机组id") @TableField("turbine_code") private String turbineCode; + @ExcelProperty("作业开始时间") @ApiModelProperty("作业开始时间") @TableField("start_time") private LocalDateTime startTime; + @ExcelProperty("作业结束时间") @ApiModelProperty("作业结束时间") @TableField("end_time") private LocalDateTime endTime; + @ExcelProperty("温度(℃)") @ApiModelProperty("温度(℃)") @TableField("temperature") private Double temperature; + @ExcelProperty("风速(m/s)") @ApiModelProperty("风速(m/s)") @TableField("wind_speed") private Double windSpeed; + @ExcelProperty("采集图片数量") @ApiModelProperty("采集图片数量") @TableField("image_count") private Integer imageCount; + @ExcelProperty("天气id") @ApiModelProperty("天气id") @TableField("weather_code") private String weatherCode; + @ExcelProperty("施工状态") @ApiModelProperty("施工状态") @TableField("status_id") private String statusId; + @ExcelProperty("当前时间") @ApiModelProperty("当前时间") @TableField("created_at") private LocalDateTime createdAt; diff --git a/core/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java index 6454a58..df83710 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/TurbineEntity.java @@ -25,12 +25,32 @@ public class TurbineEntity extends AuditableEntity implements Serializable { @ExcelProperty("机组号") @ApiModelProperty("机组号") - @TableId(value = "turbine_code", type = IdType.ASSIGN_ID) - private String turbineCode; + @TableId(value = "turbine_id", type = IdType.ASSIGN_ID) + private String turbineId; @ExcelProperty("项目id") @ApiModelProperty("项目id") @TableField("project_id") private String projectId; + + @ExcelProperty("机组名称") + @ApiModelProperty("机组名称") + @TableField("turbine_name") + private String turbineName; + + @ExcelProperty("机组描述") + @ApiModelProperty("机组描述") + @TableField("turbine_desc") + private String turbineDesc; + + @ExcelProperty("机组厂商") + @ApiModelProperty("机组厂商") + @TableField("manufacturer") + private String manufacturer; + + @ExcelProperty("机组型号") + @ApiModelProperty("机组型号") + @TableField("model") + private String model; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java index d8196bf..34933fd 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/DefectListReq.java @@ -39,10 +39,10 @@ public class DefectListReq implements Serializable { private String defectLevel; @ApiModelProperty("轴向长度(mm)") - private Object axialLength; + private BigDecimal axialLength; @ApiModelProperty("弦向长度(mm)") - private Object chordLength; + private BigDecimal chordLength; @ApiModelProperty("图片路径") private String imagePath; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/PartListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/PartListReq.java index ac11584..8f69872 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/PartListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/PartListReq.java @@ -27,7 +27,7 @@ public class PartListReq implements Serializable { private String projectId; @ApiModelProperty("机组id") - private String crewId; + private String turbineId; @ApiModelProperty("名称") private String partName; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java index da90917..499b638 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/TConstructionListReq.java @@ -1,7 +1,6 @@ package com.dite.znpt.domain.vo; -import java.math.BigDecimal; -import java.util.Date; +import java.time.LocalDateTime; import java.io.Serializable; import io.swagger.annotations.ApiModel; @@ -10,14 +9,14 @@ import lombok.Data; /** * @author huise23 - * @date 2025/04/11 23:17 + * @date 2025/04/24 13:44 * @Description: 施工信息请求实体 */ @Data @ApiModel("施工信息列表请求实体") public class TConstructionListReq implements Serializable { - private static final long serialVersionUID = -20191616975838303L; + private static final long serialVersionUID = 790780491672151941L; @ApiModelProperty("查询关键字") private String keyword; @@ -32,10 +31,10 @@ public class TConstructionListReq implements Serializable { private String turbineCode; @ApiModelProperty("作业开始时间") - private Date startTime; + private LocalDateTime startTime; @ApiModelProperty("作业结束时间") - private Date endTime; + private LocalDateTime endTime; @ApiModelProperty("温度(℃)") private BigDecimal temperature; @@ -53,7 +52,7 @@ public class TConstructionListReq implements Serializable { private String statusId; @ApiModelProperty("当前时间") - private Date createdAt; + private LocalDateTime createdAt; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java b/core/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java index cbb3ec3..3fd3947 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/TurbineListReq.java @@ -21,10 +21,22 @@ public class TurbineListReq implements Serializable { private String keyword; @ApiModelProperty("机组-项目关联Id") - private String turbineCode; + private String turbineId; @ApiModelProperty("项目id") private String projectId; + @ApiModelProperty("机组名称") + private String turbineName; + + @ApiModelProperty("机组描述") + private String turbineDesc; + + @ApiModelProperty("机组厂商") + private String manufacturer; + + @ApiModelProperty("机组型号") + private String model; + } diff --git a/core/src/main/java/com/dite/znpt/service/TurbineService.java b/core/src/main/java/com/dite/znpt/service/TurbineService.java index 2424d0d..beffffa 100644 --- a/core/src/main/java/com/dite/znpt/service/TurbineService.java +++ b/core/src/main/java/com/dite/znpt/service/TurbineService.java @@ -27,12 +27,12 @@ public interface TurbineService extends IService { /** * 功能描述:查询单条机组-项目关联 * - * @param turbineCode 机组-项目关联Id + * @param turbineId 机组-项目关联Id * @return {@link TurbineResp } * @author huise23 * @date 2025/04/11 23:17 **/ - TurbineResp selectById(String turbineCode); + TurbineResp selectById(String turbineId); /** * 功能描述:新增机组-项目关联 @@ -55,10 +55,10 @@ public interface TurbineService extends IService { /** * 功能描述:删除机组-项目关联 * - * @param turbineCode 机组-项目关联Id + * @param turbineId 机组-项目关联Id * @author huise23 * @date 2025/04/11 23:17 **/ - void deleteById(String turbineCode); + void deleteById(String turbineId); } diff --git a/core/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java index ed0c9e3..024b28d 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java @@ -43,15 +43,15 @@ public class TurbineServiceImpl extends ServiceImpl list = selectList(turbineReq); return list.isEmpty() ? CollUtil.getFirst(list) : new TurbineResp(); @@ -86,14 +86,14 @@ public class TurbineServiceImpl extends ServiceImpl - a.part_id, a.project_id, a.crew_id, a.part_name, + a.part_id, a.project_id, a.turbine_id, a.part_name, a.part_code, a.part_type, a.part_desc, a.manufacturer, a.model @@ -22,8 +22,8 @@ and a.project_id like concat ('%', #{projectId}, '%') - - and a.crew_id like concat ('%', #{crewId}, '%') + + and a.turbine_id like concat ('%', #{turbineId}, '%') and a.part_name like concat ('%', #{partName}, '%') diff --git a/core/src/main/resources/mapper/TurbineMapper.xml b/core/src/main/resources/mapper/TurbineMapper.xml index eee13f2..dc23a95 100644 --- a/core/src/main/resources/mapper/TurbineMapper.xml +++ b/core/src/main/resources/mapper/TurbineMapper.xml @@ -3,7 +3,8 @@ - a.turbine_code, a.project_id + a.turbine_id, a.project_id, a.turbine_name, a.turbine_desc, + a.manufacturer, a.model