diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index f815b1965..723206312 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -36,7 +36,7 @@ import jakarta.servlet.http.HttpServletResponse; * [周期试验] 控制器 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @RestController @AllArgsConstructor diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java index 72e89a4c0..41626da7e 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -36,7 +36,7 @@ import jakarta.servlet.http.HttpServletResponse; * [周期试验项目] 控制器 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @RestController @AllArgsConstructor diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java index 36eb4ad4c..71d815613 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java @@ -36,7 +36,7 @@ import jakarta.servlet.http.HttpServletResponse; * [周期试验任务] 控制器 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @RestController @AllArgsConstructor diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java index 42dda7616..396aad339 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java @@ -21,7 +21,7 @@ import java.io.Serial; * [周期试验] Excel实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @ColumnWidth(25) @@ -158,5 +158,23 @@ public class CycleTestGenExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("cron表达式配置OK") private Long isCronOk; + /** + * 生成任务PowerJobId + */ + @ColumnWidth(20) + @ExcelProperty("生成任务PowerJobId") + private BigDecimal powerJobIdGenTask; + /** + * 提醒PowerJobId + */ + @ColumnWidth(20) + @ExcelProperty("提醒PowerJobId") + private BigDecimal powerJobIdRemind; + /** + * 开始PowerJobId + */ + @ColumnWidth(20) + @ExcelProperty("开始PowerJobId") + private BigDecimal powerJobIdPlannedStart; } diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java index 7171563fc..2a3a58395 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java @@ -19,7 +19,7 @@ import java.io.Serial; * [周期试验项目] Excel实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @ColumnWidth(25) diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java index cdb632127..98f4d9716 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java @@ -20,7 +20,7 @@ import java.io.Serial; * [周期试验任务] Excel实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @ColumnWidth(25) diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java index 4772fdcd1..8e3eb8daa 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java @@ -16,7 +16,7 @@ import java.util.List; * [周期试验] Mapper 接口 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public interface CycleTestGenMapper extends BaseMapper { diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml index 8e0e995a4..c225649bd 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml @@ -25,6 +25,9 @@ + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java index d58c0dae0..6810db8ad 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java @@ -17,7 +17,7 @@ import java.util.List; * [周期试验项目] Mapper 接口 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public interface CycleTestItemGenMapper extends BaseMapper { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java index 4e7abda95..c93f81622 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java @@ -17,7 +17,7 @@ import java.util.List; * [周期试验任务] Mapper 接口 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public interface CycleTestTaskGenMapper extends BaseMapper { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.java new file mode 100644 index 000000000..54fb8c2de --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.IotHardnessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; + +import java.util.List; + +/** + * [IOT硬度] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IotHardnessGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotHardness 查询参数 + * @return List + */ + List selectIotHardnessPage(IPage page, IotHardnessGenVO iotHardness); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotHardness(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.xml new file mode 100644 index 000000000..b9fd6a79b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotHardnessGenMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.java new file mode 100644 index 000000000..83319b7c4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.IotThicknessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; + +import java.util.List; + +/** + * [IOT硬度] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IotThicknessGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotThickness 查询参数 + * @return List + */ + List selectIotThicknessPage(IPage page, IotThicknessGenVO iotThickness); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotThickness(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.xml new file mode 100644 index 000000000..063718589 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/IotThicknessGenMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.java new file mode 100644 index 000000000..d42376423 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.TraceChainGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; + +import java.util.List; + +/** + * [追溯链条] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface TraceChainGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceChain 查询参数 + * @return List + */ + List selectTraceChainPage(IPage page, TraceChainGenVO traceChain); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceChain(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.xml new file mode 100644 index 000000000..db5551819 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceChainGenMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.java new file mode 100644 index 000000000..d3dc493d8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.TraceEventGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; + +import java.util.List; + +/** + * [追溯事件] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface TraceEventGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceEvent 查询参数 + * @return List + */ + List selectTraceEventPage(IPage page, TraceEventGenVO traceEvent); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceEvent(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.xml new file mode 100644 index 000000000..c670f04c6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceEventGenMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.java new file mode 100644 index 000000000..e17ccb85c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.TraceItemGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; + +import java.util.List; + +/** + * [追溯明细] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface TraceItemGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceItem 查询参数 + * @return List + */ + List selectTraceItemPage(IPage page, TraceItemGenVO traceItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceItem(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.xml new file mode 100644 index 000000000..07340f6cc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/TraceItemGenMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java index 84f72bfcb..78fbb5280 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java @@ -19,5 +19,27 @@ * * CONCESSION * EXPRESSION + * + * + * + * + * THICKNESS + * + * + * + * TRACEABILITY_CHAIN + * + * PRODUCT_SN + * PROCESS_CODE + * ITEM_MODEL + * + * + * USED_QUANTITY + * + * + * OPERATE_USER_ID + * RELATED_SERIAL_NO + * + * RELATED_SN */ package org.springblade.desk.quality; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java index 10e49fcf4..95ec8624b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java @@ -13,7 +13,7 @@ import java.io.Serial; * [周期试验] 数据传输对象实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java index 825d9b6de..36a82cd87 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java @@ -13,7 +13,7 @@ import java.io.Serial; * [周期试验项目] 数据传输对象实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java index 1cfe88f6d..4fed527be 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java @@ -13,7 +13,7 @@ import java.io.Serial; * [周期试验任务] 数据传输对象实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotHardnessGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotHardnessGenDTO.java new file mode 100644 index 000000000..f45f35c77 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotHardnessGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotHardness; + +import java.io.Serial; + +/** + * [IOT硬度] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotHardnessGenDTO extends IotHardness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotThicknessGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotThicknessGenDTO.java new file mode 100644 index 000000000..213ed0d6f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/IotThicknessGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotThickness; + +import java.io.Serial; + +/** + * [IOT硬度] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotThicknessGenDTO extends IotThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceChainGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceChainGenDTO.java new file mode 100644 index 000000000..b4bf11585 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceChainGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceChain; + +import java.io.Serial; + +/** + * [追溯链条] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceChainGenDTO extends TraceChain { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceEventGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceEventGenDTO.java new file mode 100644 index 000000000..60a5520d3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceEventGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceEvent; + +import java.io.Serial; + +/** + * [追溯事件] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceEventGenDTO extends TraceEvent { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceItemGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceItemGenDTO.java new file mode 100644 index 000000000..d0614143a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/TraceItemGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceItem; + +import java.io.Serial; + +/** + * [追溯明细] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceItemGenDTO extends TraceItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java index 9d70fbf92..54adbf284 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java @@ -17,7 +17,7 @@ import java.time.LocalDateTime; * [周期试验] 实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @TableName("QA_CYCLE_TEST") @@ -28,6 +28,103 @@ public class CycleTest extends BaseEntity { @Serial private static final long serialVersionUID = 1L; + /** + * [周期试验]编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [周期试验]类型 + */ + public static final String COL_CYCLE_TEST_TYPE = "CYCLE_TEST_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [班组]id + */ + public static final String COL_TEAM_ID = "TEAM_ID"; + /** + * [供应商]id + */ + public static final String COL_SUPPLIER_ID = "SUPPLIER_ID"; + /** + * [周期试验项目]id + */ + public static final String COL_CYCLE_TEST_ITEM_ID = "CYCLE_TEST_ITEM_ID"; + /** + * [试验件]id + */ + public static final String COL_TEST_ID = "TEST_ID"; + /** + * 工艺员[用户]id + */ + public static final String COL_PROCESS_ENGINEER_USER_ID = "PROCESS_ENGINEER_USER_ID"; + /** + * 试验技术员[用户]id + */ + public static final String COL_TEST_USER_ID = "TEST_USER_ID"; + /** + * 镀种 + */ + public static final String COL_PLATE = "PLATE"; + /** + * 生成任务cron表达式 + */ + public static final String COL_CRON_GEN_TASK = "CRON_GEN_TASK"; + /** + * 提醒cron表达式 + */ + public static final String COL_CRON_REMIND = "CRON_REMIND"; + /** + * 计划开始cron表达式 + */ + public static final String COL_CRON_PLANNED_START = "CRON_PLANNED_START"; + /** + * 生成任务说明 + */ + public static final String COL_DESC_GEN_TASK = "DESC_GEN_TASK"; + /** + * 提醒说明 + */ + public static final String COL_DESC_REMIND = "DESC_REMIND"; + /** + * 计划开始说明 + */ + public static final String COL_DESC_PLANNED_START = "DESC_PLANNED_START"; + /** + * 提醒文本 + */ + public static final String COL_REMIND_TEXT = "REMIND_TEXT"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 上次试验日期 + */ + public static final String COL_LAST_TEST_DATE = "LAST_TEST_DATE"; + /** + * cron表达式配置OK + */ + public static final String COL_IS_CRON_OK = "IS_CRON_OK"; + /** + * 生成任务PowerJobId + */ + public static final String COL_POWER_JOB_ID_GEN_TASK = "POWER_JOB_ID_GEN_TASK"; + /** + * 提醒PowerJobId + */ + public static final String COL_POWER_JOB_ID_REMIND = "POWER_JOB_ID_REMIND"; + /** + * 开始PowerJobId + */ + public static final String COL_POWER_JOB_ID_PLANNED_START = "POWER_JOB_ID_PLANNED_START"; + /** * [周期试验]编码 */ @@ -133,5 +230,20 @@ public class CycleTest extends BaseEntity { */ @Schema(description = "cron表达式配置OK") private Long isCronOk; + /** + * 生成任务PowerJobId + */ + @Schema(description = "生成任务PowerJobId") + private BigDecimal powerJobIdGenTask; + /** + * 提醒PowerJobId + */ + @Schema(description = "提醒PowerJobId") + private BigDecimal powerJobIdRemind; + /** + * 开始PowerJobId + */ + @Schema(description = "开始PowerJobId") + private BigDecimal powerJobIdPlannedStart; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java index 0299c203a..cb63768a8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java @@ -15,7 +15,7 @@ import java.io.Serial; * [周期试验项目] 实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @TableName("QA_CYCLE_TEST_ITEM") @@ -26,6 +26,31 @@ public class CycleTestItem extends BaseEntity { @Serial private static final long serialVersionUID = 1L; + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_CYCLE_TEST_ITEM_TYPE = "CYCLE_TEST_ITEM_TYPE"; + /** + * 周期试验项目名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 试验条件 + */ + public static final String COL_CONDITION = "CONDITION"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** * 编码 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java index 794922b40..3887fd5b3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; * [周期试验任务] 实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @TableName("QA_CYCLE_TEST_TASK") @@ -27,6 +27,87 @@ public class CycleTestTask extends BaseEntity { @Serial private static final long serialVersionUID = 1L; + /** + * [周期试验任务]编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_CYCLE_TEST_TASK_TYPE = "CYCLE_TEST_TASK_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 配置[班组]id + */ + public static final String COL_CONFIG_TEAM_ID = "CONFIG_TEAM_ID"; + /** + * 配置[外协商]id + */ + public static final String COL_CONFIG_OEM_ID = "CONFIG_OEM_ID"; + /** + * [周期性试验项目]id + */ + public static final String COL_CYCLE_TEST_ITEM_ID = "CYCLE_TEST_ITEM_ID"; + /** + * [试验件]id + */ + public static final String COL_TEST_ID = "TEST_ID"; + /** + * 工艺员[用户]id + */ + public static final String COL_PROCESS_ENGINEER_USER_ID = "PROCESS_ENGINEER_USER_ID"; + /** + * 试验技术员[用户]id + */ + public static final String COL_TEST_USER_ID = "TEST_USER_ID"; + /** + * 下发[班组]id + */ + public static final String COL_SEND_TEAM_ID = "SEND_TEAM_ID"; + /** + * 下发[外协商]id + */ + public static final String COL_SEND_OME_ID = "SEND_OME_ID"; + /** + * 下发人员[用户]id + */ + public static final String COL_SNED_USER_ID = "SNED_USER_ID"; + /** + * 数量 + */ + public static final String COL_QUANTITY = "QUANTITY"; + /** + * 镀种 + */ + public static final String COL_PLATE = "PLATE"; + /** + * 零件号 + */ + public static final String COL_PART_CODE = "PART_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_CODE = "BATCH_CODE"; + /** + * 专家描述 + */ + public static final String COL_EXPERT_DESC = "EXPERT_DESC"; + /** + * 评审描述 + */ + public static final String COL_REVIEW_DESC = "REVIEW_DESC"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** * [周期试验任务]编码 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java new file mode 100644 index 000000000..3580aaea8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java @@ -0,0 +1,124 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [IOT硬度] 实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@TableName("QA_IOT_HARDNESS") +@Schema(description = "IotHardness Entity对象") +@EqualsAndHashCode(callSuper = true) +public class IotHardness extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 使用标记位 + */ + public static final String COL_FLAG_USE = "FLAG_USE"; + /** + * 读取标记位 + */ + public static final String COL_FLAG_READ = "FLAG_READ"; + /** + * 设备号 + */ + public static final String COL_EQUIPMENT_CODE = "EQUIPMENT_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_NO = "BATCH_NO"; + /** + * 检测内容 + */ + public static final String COL_DATA = "DATA"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 数据上传时间 + */ + public static final String COL_UPLOAD_DATE = "UPLOAD_DATE"; + /** + * [设备]id + */ + public static final String COL_EQUIPMENT_ID = "EQUIPMENT_ID"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 使用标记位 + */ + @Schema(description = "使用标记位") + private Long flagUse; + /** + * 读取标记位 + */ + @Schema(description = "读取标记位") + private Long flagRead; + /** + * 设备号 + */ + @Schema(description = "设备号") + private String equipmentCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * 检测内容 + */ + @Schema(description = "检测内容") + private String data; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 数据上传时间 + */ + @Schema(description = "数据上传时间") + private LocalDateTime uploadDate; + /** + * [设备]id + */ + @Schema(description = "[设备]id") + private BigDecimal equipmentId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java new file mode 100644 index 000000000..4367c0298 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java @@ -0,0 +1,123 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [IOT硬度] 实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@TableName("QA_IOT_THICKNESS") +@Schema(description = "IotThickness Entity对象") +@EqualsAndHashCode(callSuper = true) +public class IotThickness extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 使用标记位 + */ + public static final String COL_FLAG_USE = "FLAG_USE"; + /** + * 读取标记位 + */ + public static final String COL_FLAG_READ = "FLAG_READ"; + /** + * 设备号 + */ + public static final String COL_EQUIPMENT_CODE = "EQUIPMENT_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_NO = "BATCH_NO"; + /** + * 检测内容 + */ + public static final String COL_DATA = "DATA"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 数据上传时间 + */ + public static final String COL_UPLOAD_DATE = "UPLOAD_DATE"; + /** + * [设备]id + */ + public static final String COL_EQUIPMENT_ID = "EQUIPMENT_ID"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 使用标记位 + */ + @Schema(description = "使用标记位") + private Long flagUse; + /** + * 读取标记位 + */ + @Schema(description = "读取标记位") + private Long flagRead; + /** + * 设备号 + */ + @Schema(description = "设备号") + private String equipmentCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * 检测内容 + */ + @Schema(description = "检测内容") + private String data; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 数据上传时间 + */ + @Schema(description = "数据上传时间") + private LocalDateTime uploadDate; + /** + * [设备]id + */ + @Schema(description = "[设备]id") + private BigDecimal equipmentId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java new file mode 100644 index 000000000..a53a53234 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java @@ -0,0 +1,159 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [追溯链条] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_TRACE_CHAIN") +@Schema(description = "TraceChain Entity对象") +@EqualsAndHashCode(callSuper = true) +public class TraceChain extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [追溯链条]类型 + */ + public static final String COL_TRACE_CHAIN_TYPE = "TRACE_CHAIN_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [制品]id + */ + public static final String COL_PRODUCT_ID = "PRODUCT_ID"; + /** + * [工单]id + */ + public static final String COL_WORK_ORDER_ID = "WORK_ORDER_ID"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * 追溯操作人[用户]id + */ + public static final String COL_TRACE_USER_ID = "TRACE_USER_ID"; + /** + * 制品序列号 + */ + public static final String COL_PRODUCT_SN = "PRODUCT_SN"; + /** + * 工单编号 + */ + public static final String COL_WORK_ORDER_CODE = "WORK_ORDER_CODE"; + /** + * 工序编号 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + /** + * 追溯时间 + */ + public static final String COL_TRACE_DATE = "TRACE_DATE"; + /** + * 追溯结果 + */ + public static final String COL_TRACE_RESULT = "TRACE_RESULT"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * [追溯链条]类型 + */ + @Schema(description = "[追溯链条]类型") + private Long traceChainType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [工单]id + */ + @Schema(description = "[工单]id") + private BigDecimal workOrderId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * 追溯操作人[用户]id + */ + @Schema(description = "追溯操作人[用户]id") + private BigDecimal traceUserId; + /** + * 制品序列号 + */ + @Schema(description = "制品序列号") + private Long productSn; + /** + * 工单编号 + */ + @Schema(description = "工单编号") + private Long workOrderCode; + /** + * 工序编号 + */ + @Schema(description = "工序编号") + private Long processCode; + /** + * 追溯时间 + */ + @Schema(description = "追溯时间") + private LocalDateTime traceDate; + /** + * 追溯结果 + */ + @Schema(description = "追溯结果") + private String traceResult; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java new file mode 100644 index 000000000..87ca83f60 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java @@ -0,0 +1,123 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [追溯事件] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_TRACE_EVENT") +@Schema(description = "TraceEvent Entity对象") +@EqualsAndHashCode(callSuper = true) +public class TraceEvent extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * [追溯事件]类型 + */ + public static final String COL_EVENT_TYPE = "EVENT_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [追溯链条]id + */ + public static final String COL_TRACE_CHAIN_ID = "TRACE_CHAIN_ID"; + /** + * 操作[用户]id + */ + public static final String COL_OPERATE_USER_ID = "OPERATE_USER_ID"; + /** + * 事件时间 + */ + public static final String COL_EVENT_DATE = "EVENT_DATE"; + /** + * 关联序列号 + */ + public static final String COL_RELATED_SN = "RELATED_SN"; + /** + * 事件描述 + */ + public static final String COL_EVENT_DESC = "EVENT_DESC"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * [追溯事件]类型 + */ + @Schema(description = "[追溯事件]类型") + private Long eventType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [追溯链条]id + */ + @Schema(description = "[追溯链条]id") + private BigDecimal traceChainId; + /** + * 操作[用户]id + */ + @Schema(description = "操作[用户]id") + private BigDecimal operateUserId; + /** + * 事件时间 + */ + @Schema(description = "事件时间") + private LocalDateTime eventDate; + /** + * 关联序列号 + */ + @Schema(description = "关联序列号") + private String relatedSn; + /** + * 事件描述 + */ + @Schema(description = "事件描述") + private String eventDesc; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java new file mode 100644 index 000000000..1fa7eb14c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java @@ -0,0 +1,149 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [追溯明细] 实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@TableName("QA_TRACE_ITEM") +@Schema(description = "TraceItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class TraceItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 类型 + */ + public static final String COL_TRACE_ITEM_TYPE = "TRACE_ITEM_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [追溯链条]id + */ + public static final String COL_QA_TRACE_CHAIN_ID = "QA_TRACE_CHAIN_ID"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * 物料/半成品/成品序列号 + */ + public static final String COL_ITEM_SN = "ITEM_SN"; + /** + * 型号 + */ + public static final String COL_ITEM_MODEL = "ITEM_MODEL"; + /** + * 批次号 + */ + public static final String COL_ITEM_BATCH_CODE = "ITEM_BATCH_CODE"; + /** + * [工序]编码 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + /** + * 使用数量 + */ + public static final String COL_USED_QUANTITY = "USED_QUANTITY"; + /** + * 父项序列号 + */ + public static final String COL_PARENT_ITEM_SN = "PARENT_ITEM_SN"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long traceItemType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [追溯链条]id + */ + @Schema(description = "[追溯链条]id") + private BigDecimal qaTraceChainId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * 物料/半成品/成品序列号 + */ + @Schema(description = "物料/半成品/成品序列号") + private Long itemSn; + /** + * 型号 + */ + @Schema(description = "型号") + private Long itemModel; + /** + * 批次号 + */ + @Schema(description = "批次号") + private Long itemBatchCode; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private Long processCode; + /** + * 使用数量 + */ + @Schema(description = "使用数量") + private Long usedQuantity; + /** + * 父项序列号 + */ + @Schema(description = "父项序列号") + private Long parentItemSn; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java new file mode 100644 index 000000000..7a87b5d53 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -0,0 +1,11 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskSearch extends InspectionTask { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java index cb1a67017..ab6f802eb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java @@ -13,7 +13,7 @@ import java.io.Serial; * [周期试验] 视图实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java index 8a7b17933..2f0996f33 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java @@ -13,7 +13,7 @@ import java.io.Serial; * [周期试验项目] 视图实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java index 66bccdadb..8ea6faf14 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java @@ -13,7 +13,7 @@ import java.io.Serial; * [周期试验任务] 视图实体类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotHardnessGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotHardnessGenVO.java new file mode 100644 index 000000000..be3cc64b4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotHardnessGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotHardness; + +import java.io.Serial; + +/** + * [IOT硬度] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotHardnessGenVO extends IotHardness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotThicknessGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotThicknessGenVO.java new file mode 100644 index 000000000..483418884 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/IotThicknessGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.IotThickness; + +import java.io.Serial; + +/** + * [IOT硬度] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class IotThicknessGenVO extends IotThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceChainGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceChainGenVO.java new file mode 100644 index 000000000..906d88ad5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceChainGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceChain; + +import java.io.Serial; + +/** + * [追溯链条] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceChainGenVO extends TraceChain { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceEventGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceEventGenVO.java new file mode 100644 index 000000000..336c09251 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceEventGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceEvent; + +import java.io.Serial; + +/** + * [追溯事件] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceEventGenVO extends TraceEvent { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceItemGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceItemGenVO.java new file mode 100644 index 000000000..2b49e0e87 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/TraceItemGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.TraceItem; + +import java.io.Serial; + +/** + * [追溯明细] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TraceItemGenVO extends TraceItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessDeleteService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessDeleteService.java new file mode 100644 index 000000000..f13f3714c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessDeleteService.java @@ -0,0 +1,29 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.mapper.gen.IotHardnessGenMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Data +@Slf4j +public class IotHardnessDeleteService { + @Resource + private IotHardnessGenMapper genMapper; + + /** + * 分批独立事务。 + * + * @param ids + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Integer deleteHistoryOneBatch(List ids) { + return genMapper.deleteByIds(ids); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService.java new file mode 100644 index 000000000..ad09d9f65 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService.java @@ -0,0 +1,63 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.mapper.gen.IotHardnessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +@Data +@Slf4j +public class IotHardnessService { + + public static final Integer BATCH_SIZE = 1000; + + @Resource + private IotHardnessGenMapper genMapper; + @Resource + private IotHardnessDeleteService deleteService; + + /** + * 物理删除历史数据 + * + * @return + */ + public Integer deleteHistory() { + LocalDateTime day7ago = LocalDateTime.now().minusDays(7); + QueryWrapper qw = new QueryWrapper<>(); + qw.lt(ColBase.CREATE_TIME, day7ago); + qw.select(ColBase.ID); + List list = genMapper.selectList(qw); + if (list.isEmpty()) { + log.info("没有超过七天的删除数据。"); + return 0; + } + int totalDeleted = 0; + int currentPage = 1; + while (true) { + IPage page = new Page<>(currentPage, BATCH_SIZE); + IPage resultPage = genMapper.selectPage(page, qw); + List currentBatch = resultPage.getRecords(); + if (currentBatch.isEmpty()) { + break; + } + List ids = list.stream() + .map(IotHardness::getId) + .toList(); + int deletedCount = deleteService.deleteHistoryOneBatch(ids); + totalDeleted = totalDeleted + deletedCount; + currentPage = currentPage + 1; + } + return totalDeleted; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessDeleteService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessDeleteService.java new file mode 100644 index 000000000..d5ac07cc7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessDeleteService.java @@ -0,0 +1,30 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.mapper.gen.IotThicknessGenMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Data +@Slf4j +public class IotThicknessDeleteService { + + @Resource + private IotThicknessGenMapper genMapper; + + /** + * 分批独立事务。 + * + * @param ids + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Integer deleteHistoryOneBatch(List ids) { + return genMapper.deleteByIds(ids); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessService.java new file mode 100644 index 000000000..7457f5ff2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotThicknessService.java @@ -0,0 +1,63 @@ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.ColBase; +import org.springblade.desk.quality.mapper.gen.IotThicknessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +@Data +@Slf4j +public class IotThicknessService { + + public static final Integer BATCH_SIZE = 1000; + + @Resource + private IotThicknessGenMapper genMapper; + @Resource + private IotThicknessDeleteService deleteService; + + /** + * 物理删除历史数据 + * + * @return + */ + public Integer deleteHistory() { + LocalDateTime day7ago = LocalDateTime.now().minusDays(7); + QueryWrapper qw = new QueryWrapper<>(); + qw.lt(ColBase.CREATE_TIME, day7ago); + qw.select(ColBase.ID); + List list = genMapper.selectList(qw); + if (list.isEmpty()) { + log.info("没有超过七天的删除数据。"); + return 0; + } + int totalDeleted = 0; + int currentPage = 1; + while (true) { + IPage page = new Page<>(currentPage, BATCH_SIZE); + IPage resultPage = genMapper.selectPage(page, qw); + List currentBatch = resultPage.getRecords(); + if (currentBatch.isEmpty()) { + break; + } + List ids = list.stream() + .map(IotThickness::getId) + .toList(); + int deletedCount = deleteService.deleteHistoryOneBatch(ids); + totalDeleted = totalDeleted + deletedCount; + currentPage = currentPage + 1; + } + return totalDeleted; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java index dfa8ff9bb..32c160a40 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java @@ -16,7 +16,7 @@ import java.util.List; * [周期试验] 服务类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public interface ICycleTestGenService extends BaseService { /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java index 6a66ab249..4c05a9c40 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java @@ -16,7 +16,7 @@ import java.util.List; * [周期试验项目] 服务类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public interface ICycleTestItemGenService extends BaseService { /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java index 6ed2886ad..3c0041890 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java @@ -16,7 +16,7 @@ import java.util.List; * [周期试验任务] 服务类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public interface ICycleTestTaskGenService extends BaseService { /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotHardnessGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotHardnessGenService.java new file mode 100644 index 000000000..2945d3e0e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotHardnessGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.IotHardnessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; + +import java.util.List; + +/** + * [IOT硬度] 服务类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IIotHardnessGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotHardness 查询参数 + * @return IPage + */ + IPage selectIotHardnessPage(IPage page, IotHardnessGenVO iotHardness); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotHardness(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotThicknessGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotThicknessGenService.java new file mode 100644 index 000000000..4a6959a40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/IIotThicknessGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.IotThicknessGenExcel; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; + +import java.util.List; + +/** + * [IOT硬度] 服务类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public interface IIotThicknessGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotThickness 查询参数 + * @return IPage + */ + IPage selectIotThicknessPage(IPage page, IotThicknessGenVO iotThickness); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotThickness(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceChainGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceChainGenService.java new file mode 100644 index 000000000..d56e63c31 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceChainGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.TraceChainGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; + +import java.util.List; + +/** + * [追溯链条] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ITraceChainGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceChain 查询参数 + * @return IPage + */ + IPage selectTraceChainPage(IPage page, TraceChainGenVO traceChain); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceChain(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceEventGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceEventGenService.java new file mode 100644 index 000000000..d6045ecda --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceEventGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.TraceEventGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; + +import java.util.List; + +/** + * [追溯事件] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ITraceEventGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceEvent 查询参数 + * @return IPage + */ + IPage selectTraceEventPage(IPage page, TraceEventGenVO traceEvent); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceEvent(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceItemGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceItemGenService.java new file mode 100644 index 000000000..bdfa1e900 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ITraceItemGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.TraceItemGenExcel; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; + +import java.util.List; + +/** + * [追溯明细] 服务类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public interface ITraceItemGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param traceItem 查询参数 + * @return IPage + */ + IPage selectTraceItemPage(IPage page, TraceItemGenVO traceItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTraceItem(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java index 7f508624d..38cd674cf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; * [周期试验] 服务实现类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Service public class CycleTestGenServiceImpl extends BaseServiceImpl implements ICycleTestGenService { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java index b8f04a1cc..870000676 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; * [周期试验项目] 服务实现类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Service public class CycleTestItemGenServiceImpl extends BaseServiceImpl implements ICycleTestItemGenService { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java index b1a1ef96f..485264dec 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; * [周期试验任务] 服务实现类 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ @Service public class CycleTestTaskGenServiceImpl extends BaseServiceImpl implements ICycleTestTaskGenService { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotHardnessGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotHardnessGenServiceImpl.java new file mode 100644 index 000000000..9eb92618c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotHardnessGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.IotHardnessGenExcel; +import org.springblade.desk.quality.mapper.gen.IotHardnessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; +import org.springblade.desk.quality.service.gen.IIotHardnessGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [IOT硬度] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Service +public class IotHardnessGenServiceImpl extends BaseServiceImpl implements IIotHardnessGenService { + + @Override + public IPage selectIotHardnessPage(IPage page, IotHardnessGenVO iotHardness) { + return page.setRecords(baseMapper.selectIotHardnessPage(page, iotHardness)); + } + + @Override + public List exportIotHardness(Wrapper queryWrapper) { + List iotHardnessList = baseMapper.exportIotHardness(queryWrapper); + //iotHardnessList.forEach(iotHardness -> { + // iotHardness.setTypeName(DictCache.getValue(DictEnum.YES_NO, IotHardness.getType())); + //}); + return iotHardnessList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotThicknessGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotThicknessGenServiceImpl.java new file mode 100644 index 000000000..d19b6f9a6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/IotThicknessGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.IotThicknessGenExcel; +import org.springblade.desk.quality.mapper.gen.IotThicknessGenMapper; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; +import org.springblade.desk.quality.service.gen.IIotThicknessGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [IOT硬度] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +@Service +public class IotThicknessGenServiceImpl extends BaseServiceImpl implements IIotThicknessGenService { + + @Override + public IPage selectIotThicknessPage(IPage page, IotThicknessGenVO iotThickness) { + return page.setRecords(baseMapper.selectIotThicknessPage(page, iotThickness)); + } + + @Override + public List exportIotThickness(Wrapper queryWrapper) { + List iotThicknessList = baseMapper.exportIotThickness(queryWrapper); + //iotThicknessList.forEach(iotThickness -> { + // iotThickness.setTypeName(DictCache.getValue(DictEnum.YES_NO, IotThickness.getType())); + //}); + return iotThicknessList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceChainGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceChainGenServiceImpl.java new file mode 100644 index 000000000..a5b67541c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceChainGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.TraceChainGenExcel; +import org.springblade.desk.quality.mapper.gen.TraceChainGenMapper; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; +import org.springblade.desk.quality.service.gen.ITraceChainGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [追溯链条] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class TraceChainGenServiceImpl extends BaseServiceImpl implements ITraceChainGenService { + + @Override + public IPage selectTraceChainPage(IPage page, TraceChainGenVO traceChain) { + return page.setRecords(baseMapper.selectTraceChainPage(page, traceChain)); + } + + @Override + public List exportTraceChain(Wrapper queryWrapper) { + List traceChainList = baseMapper.exportTraceChain(queryWrapper); + //traceChainList.forEach(traceChain -> { + // traceChain.setTypeName(DictCache.getValue(DictEnum.YES_NO, TraceChain.getType())); + //}); + return traceChainList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceEventGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceEventGenServiceImpl.java new file mode 100644 index 000000000..8a9f68e7a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceEventGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.TraceEventGenExcel; +import org.springblade.desk.quality.mapper.gen.TraceEventGenMapper; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; +import org.springblade.desk.quality.service.gen.ITraceEventGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [追溯事件] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class TraceEventGenServiceImpl extends BaseServiceImpl implements ITraceEventGenService { + + @Override + public IPage selectTraceEventPage(IPage page, TraceEventGenVO traceEvent) { + return page.setRecords(baseMapper.selectTraceEventPage(page, traceEvent)); + } + + @Override + public List exportTraceEvent(Wrapper queryWrapper) { + List traceEventList = baseMapper.exportTraceEvent(queryWrapper); + //traceEventList.forEach(traceEvent -> { + // traceEvent.setTypeName(DictCache.getValue(DictEnum.YES_NO, TraceEvent.getType())); + //}); + return traceEventList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceItemGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceItemGenServiceImpl.java new file mode 100644 index 000000000..2e8a63ee9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/TraceItemGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.TraceItemGenExcel; +import org.springblade.desk.quality.mapper.gen.TraceItemGenMapper; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; +import org.springblade.desk.quality.service.gen.ITraceItemGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [追溯明细] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +@Service +public class TraceItemGenServiceImpl extends BaseServiceImpl implements ITraceItemGenService { + + @Override + public IPage selectTraceItemPage(IPage page, TraceItemGenVO traceItem) { + return page.setRecords(baseMapper.selectTraceItemPage(page, traceItem)); + } + + @Override + public List exportTraceItem(Wrapper queryWrapper) { + List traceItemList = baseMapper.exportTraceItem(queryWrapper); + //traceItemList.forEach(traceItem -> { + // traceItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, TraceItem.getType())); + //}); + return traceItemList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java deleted file mode 100644 index a19f8855b..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springblade.desk.quality.service.scheduled; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - - -@Service -@Data -@Slf4j -public class LiquidTankTaskScheduledService { - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java index fa9b7fd88..7e6ec9f81 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java @@ -14,7 +14,7 @@ import java.util.Objects; * [周期试验] 包装类,返回视图层所需的字段 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public class CycleTestGenWrapper extends BaseEntityWrapper { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java index d68b10a7b..6555ff35d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java @@ -14,7 +14,7 @@ import java.util.Objects; * [周期试验项目] 包装类,返回视图层所需的字段 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public class CycleTestItemGenWrapper extends BaseEntityWrapper { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java index 64cc1c28c..7847f8d64 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java @@ -14,7 +14,7 @@ import java.util.Objects; * [周期试验任务] 包装类,返回视图层所需的字段 * * @author Tom Shuo - * @since 2025-11-14 + * @since 2025-11-17 */ public class CycleTestTaskGenWrapper extends BaseEntityWrapper { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotHardnessGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotHardnessGenWrapper.java new file mode 100644 index 000000000..6cebb72cd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotHardnessGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.gen.IotHardnessGenVO; + +import java.util.Objects; + +/** + * [IOT硬度] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public class IotHardnessGenWrapper extends BaseEntityWrapper { + + public static IotHardnessGenWrapper build() { + return new IotHardnessGenWrapper(); + } + + @Override + public IotHardnessGenVO entityVO(IotHardness iotHardness) { + IotHardnessGenVO iotHardnessVO = Objects.requireNonNull(BeanUtil.copyProperties(iotHardness, IotHardnessGenVO.class)); + + //User createUser = UserCache.getUser(iotHardness.getCreateUser()); + //User updateUser = UserCache.getUser(iotHardness.getUpdateUser()); + //iotHardnessVO.setCreateUserName(createUser.getName()); + //iotHardnessVO.setUpdateUserName(updateUser.getName()); + + return iotHardnessVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotThicknessGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotThicknessGenWrapper.java new file mode 100644 index 000000000..589df8655 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/IotThicknessGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.IotThickness; +import org.springblade.desk.quality.pojo.vo.gen.IotThicknessGenVO; + +import java.util.Objects; + +/** + * [IOT硬度] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-16 + */ +public class IotThicknessGenWrapper extends BaseEntityWrapper { + + public static IotThicknessGenWrapper build() { + return new IotThicknessGenWrapper(); + } + + @Override + public IotThicknessGenVO entityVO(IotThickness iotThickness) { + IotThicknessGenVO iotThicknessVO = Objects.requireNonNull(BeanUtil.copyProperties(iotThickness, IotThicknessGenVO.class)); + + //User createUser = UserCache.getUser(iotThickness.getCreateUser()); + //User updateUser = UserCache.getUser(iotThickness.getUpdateUser()); + //iotThicknessVO.setCreateUserName(createUser.getName()); + //iotThicknessVO.setUpdateUserName(updateUser.getName()); + + return iotThicknessVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceChainGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceChainGenWrapper.java new file mode 100644 index 000000000..1f046701e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceChainGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.TraceChain; +import org.springblade.desk.quality.pojo.vo.gen.TraceChainGenVO; + +import java.util.Objects; + +/** + * [追溯链条] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class TraceChainGenWrapper extends BaseEntityWrapper { + + public static TraceChainGenWrapper build() { + return new TraceChainGenWrapper(); + } + + @Override + public TraceChainGenVO entityVO(TraceChain traceChain) { + TraceChainGenVO traceChainVO = Objects.requireNonNull(BeanUtil.copyProperties(traceChain, TraceChainGenVO.class)); + + //User createUser = UserCache.getUser(traceChain.getCreateUser()); + //User updateUser = UserCache.getUser(traceChain.getUpdateUser()); + //traceChainVO.setCreateUserName(createUser.getName()); + //traceChainVO.setUpdateUserName(updateUser.getName()); + + return traceChainVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceEventGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceEventGenWrapper.java new file mode 100644 index 000000000..51d0e4fc7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceEventGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.TraceEvent; +import org.springblade.desk.quality.pojo.vo.gen.TraceEventGenVO; + +import java.util.Objects; + +/** + * [追溯事件] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class TraceEventGenWrapper extends BaseEntityWrapper { + + public static TraceEventGenWrapper build() { + return new TraceEventGenWrapper(); + } + + @Override + public TraceEventGenVO entityVO(TraceEvent traceEvent) { + TraceEventGenVO traceEventVO = Objects.requireNonNull(BeanUtil.copyProperties(traceEvent, TraceEventGenVO.class)); + + //User createUser = UserCache.getUser(traceEvent.getCreateUser()); + //User updateUser = UserCache.getUser(traceEvent.getUpdateUser()); + //traceEventVO.setCreateUserName(createUser.getName()); + //traceEventVO.setUpdateUserName(updateUser.getName()); + + return traceEventVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceItemGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceItemGenWrapper.java new file mode 100644 index 000000000..603739147 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/TraceItemGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.TraceItem; +import org.springblade.desk.quality.pojo.vo.gen.TraceItemGenVO; + +import java.util.Objects; + +/** + * [追溯明细] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-17 + */ +public class TraceItemGenWrapper extends BaseEntityWrapper { + + public static TraceItemGenWrapper build() { + return new TraceItemGenWrapper(); + } + + @Override + public TraceItemGenVO entityVO(TraceItem traceItem) { + TraceItemGenVO traceItemVO = Objects.requireNonNull(BeanUtil.copyProperties(traceItem, TraceItemGenVO.class)); + + //User createUser = UserCache.getUser(traceItem.getCreateUser()); + //User updateUser = UserCache.getUser(traceItem.getUpdateUser()); + //traceItemVO.setCreateUserName(createUser.getName()); + //traceItemVO.setUpdateUserName(updateUser.getName()); + + return traceItemVO; + } + +}