重新生成代码

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")

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("图片路径")

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")
+    @TableField("turbine_id")
-    private String crewId;
+    private String turbineId;
 
     @ExcelProperty("名称")
     @ApiModelProperty("名称")

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;

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)
+    @TableId(value = "turbine_id", type = IdType.ASSIGN_ID)
-    private String turbineCode;
+    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;
 }
 

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;

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;

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.time.LocalDateTime;
-import java.util.Date;
 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;
 
 }
 

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;
+
 }
 

core/src/main/java/com/dite/znpt/service/TurbineService.java

@@ -27,12 +27,12 @@ public interface TurbineService extends IService<TurbineEntity> {
     /**
      * 功能描述：查询单条机组-项目关联
      *
-     * @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<TurbineEntity> {
     /**
      * 功能描述：删除机组-项目关联
      *
-     * @param turbineCode 机组-项目关联Id
+     * @param turbineId 机组-项目关联Id
      * @author huise23
      * @date 2025/04/11 23:17
      **/
-    void deleteById(String turbineCode);
+    void deleteById(String turbineId);
 }
 

core/src/main/java/com/dite/znpt/service/impl/TurbineServiceImpl.java

@@ -43,15 +43,15 @@ public class TurbineServiceImpl extends ServiceImpl<TurbineMapper, TurbineEntity
     /**
      * 功能描述：查询单条机组-项目关联
      *
-     * @param turbineCode 机组-项目关联Id
+     * @param turbineId 机组-项目关联Id
      * @return {@link TurbineResp }
      * @author huise23
      * @date 2025/04/11 23:17
      **/
     @Override
-    public TurbineResp selectById(String turbineCode) {
+    public TurbineResp selectById(String turbineId) {
         TurbineListReq turbineReq = new TurbineListReq();
-        turbineReq.setTurbineCode(turbineCode);
+        turbineReq.setTurbineId(turbineId);
 
         List<TurbineResp> list = selectList(turbineReq);
         return list.isEmpty() ? CollUtil.getFirst(list) : new TurbineResp();
@@ -86,14 +86,14 @@ public class TurbineServiceImpl extends ServiceImpl<TurbineMapper, TurbineEntity
     /**
      * 功能描述：删除机组-项目关联
      *
-     * @param turbineCode 机组-项目关联Id
+     * @param turbineId 机组-项目关联Id
      * @author huise23
      * @date 2025/04/11 23:17
      **/
     @Override
-    public void deleteById(String turbineCode) {
+    public void deleteById(String turbineId) {
 //            todo 校验
-        removeById(turbineCode);
+        removeById(turbineId);
     }
 
 }

core/src/main/resources/mapper/PartMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.dite.znpt.mapper.PartMapper">
 
     <sql id="Base_Column_List">
-        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
     </sql>
@@ -22,8 +22,8 @@
             <if test="projectId != null and projectId != ''">
                 and a.project_id like concat ('%', #{projectId}, '%')
             </if>
-            <if test="crewId != null and crewId != ''">
+            <if test="turbineId != null and turbineId != ''">
-                and a.crew_id like concat ('%', #{crewId}, '%')
+                and a.turbine_id like concat ('%', #{turbineId}, '%')
             </if>
             <if test="partName != null and partName != ''">
                 and a.part_name like concat ('%', #{partName}, '%')

core/src/main/resources/mapper/TurbineMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.dite.znpt.mapper.TurbineMapper">
 
     <sql id="Base_Column_List">
-        a.turbine_code,         a.project_id
+        a.turbine_id,         a.project_id,         a.turbine_name,         a.turbine_desc, 
+        a.manufacturer,         a.model
     </sql>
 
     <select id="queryBySelective" resultType="com.dite.znpt.domain.vo.TurbineResp">
@@ -14,12 +15,24 @@
             <if test="keyword != null and keyword != ''">
 #                and (a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%') or a.TODO like concat('%', #{keyword,jdbcType=VARCHAR}, '%'))
             </if>
-            <if test="turbineCode != null and turbineCode != ''">
+            <if test="turbineId != null and turbineId != ''">
-                and a.turbine_code like concat ('%', #{turbineCode}, '%')
+                and a.turbine_id like concat ('%', #{turbineId}, '%')
             </if>
             <if test="projectId != null and projectId != ''">
                 and a.project_id like concat ('%', #{projectId}, '%')
             </if>
+            <if test="turbineName != null and turbineName != ''">
+                and a.turbine_name like concat ('%', #{turbineName}, '%')
+            </if>
+            <if test="turbineDesc != null and turbineDesc != ''">
+                and a.turbine_desc like concat ('%', #{turbineDesc}, '%')
+            </if>
+            <if test="manufacturer != null and manufacturer != ''">
+                and a.manufacturer like concat ('%', #{manufacturer}, '%')
+            </if>
+            <if test="model != null and model != ''">
+                and a.model like concat ('%', #{model}, '%')
+            </if>
         </where>
     </select>
 </mapper>