diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskTimeoutProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskTimeoutProcessor.java new file mode 100644 index 0000000..750d007 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskTimeoutProcessor.java @@ -0,0 +1,19 @@ +package org.springblade.job.processor.quality; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +@Component +@Data +@Slf4j +public class CycleTestTaskTimeoutProcessor implements BasicProcessor { + + @Override + public ProcessResult process(TaskContext context) throws Exception { + return null; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml index c225649..f5d9e66 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml @@ -11,7 +11,7 @@ - + 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 9b4a664..be8b851 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 @@ -45,7 +45,7 @@ * * WORKSTATION * - * + * TEMPERATURE * */ 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/entity/CycleTest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java index 546f240..e39b02e 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 @@ -163,7 +163,7 @@ public class CycleTest extends BaseEntity { * 工艺员[用户]id */ @Schema(description = "工艺员[用户]id") - private Long processEngineerUserId; + private Long processUserId; /** * 试验技术员[用户]id */ 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 008133d..a59f0f4 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 @@ -57,7 +57,7 @@ public class CycleTestTask extends BaseEntity { /** * 工艺员[用户]id */ - public static final String COL_PROCESS_ENGINEER_USER_ID = "PROCESS_ENGINEER_USER_ID"; + public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID"; /** * 试验技术员[用户]id */ @@ -146,7 +146,7 @@ public class CycleTestTask extends BaseEntity { * 工艺员[用户]id */ @Schema(description = "工艺员[用户]id") - private Long processEngineerUserId; + private Long processUserId; /** * 试验技术员[用户]id */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java index baedc4a..1ee94ff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java @@ -35,5 +35,8 @@ * * SPECIAL * SHIFT + * + * + * PRIORITY */ package org.springblade.desk.quality.pojo.entity; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java index 2641ac0..ff69f3b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java @@ -9,6 +9,4 @@ public class CycleTestTaskFillData { * [周期试验任务]id */ Long id; - - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java index 44bf429..76a500d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java @@ -8,7 +8,7 @@ public class CycleTestTaskIssue { /** * [周期试验任务]id */ - Long id; + String ids; /** * 检测员[用户]id */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java new file mode 100644 index 0000000..b71d91c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class CycleTestTaskIssueBat { + + /** + * [周期试验任务]id + */ + Long id; + /** + * 检测员[用户]id + */ + Long testUserId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java new file mode 100644 index 0000000..b523397 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java @@ -0,0 +1,11 @@ +package org.springblade.desk.quality.pojo.request; + +public class CycleTestUpdateUserBat { + + /** + * + */ + String ids; + + +} 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 index 702f739..333c4a1 100644 --- 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 @@ -9,5 +9,4 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask; public class InspectionTaskSearch extends InspectionTask { - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFinish.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java similarity index 84% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFinish.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java index 8d374a8..70e9b11 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFinish.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java @@ -3,7 +3,7 @@ package org.springblade.desk.quality.pojo.request; import lombok.Data; @Data -public class LiquidTankTaskFinish { +public class LiquidTankTaskClose { /** * [槽液检测任务]id diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java new file mode 100644 index 0000000..7c3b552 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskCloseBat { + + /** + * [槽液检测任务]ids + */ + String ids; + /** + * 结束原因 + */ + String finishReason; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java new file mode 100644 index 0000000..ef8ed21 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java @@ -0,0 +1,9 @@ +package org.springblade.desk.quality.pojo.request; + +public class LiquidTankTaskException { + + /** + * [槽液检测任务]id + */ + Long id; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java new file mode 100644 index 0000000..3279538 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java @@ -0,0 +1,20 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskFillDataBat { + + /** + * [槽液检测任务]ids + */ + String ids; + /** + * 测量值 + */ + Long testValue; + /** + * 1:首测 2:复测 + */ + Integer fillDataType; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java new file mode 100644 index 0000000..e31c439 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankTaskIssueBat { + + /** + * [槽液检测任务]id + */ + String ids; + /** + * 检测员[用户]id + */ + Long testUserId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java new file mode 100644 index 0000000..85888f3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java @@ -0,0 +1,13 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; + +@Data +public class LiquidTankUpdateBat { + + String ids; + + Long processUserId; + + Long teamId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService.java new file mode 100644 index 0000000..716908c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService.java @@ -0,0 +1,21 @@ +package org.springblade.desk.quality.service; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class CycleTestService { + + @Resource + private CycleTestGenMapper genMapper; + + public R updateUserBat() { + return null; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java index ba19c55..403435b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java @@ -34,7 +34,7 @@ public class InspectionTaskService { private InspectionResultGenMapper resultGenMapper; /** - * 超时提醒。 + * 超期提醒。 * * @param id * @return diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankReportService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankReportService.java new file mode 100644 index 0000000..cae64c5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankReportService.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.service; + +/** + * 槽液报告 + */ +public class LiquidTankReportService { + + /** + * 生成报告 + */ + public void generateReport() { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java index ea6caef..f83057a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java @@ -10,6 +10,7 @@ import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper; import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.request.LiquidTankSubmit; +import org.springblade.desk.quality.pojo.request.LiquidTankUpdateBat; import org.springblade.desk.quality.service.gen.ILiquidTankGenService; import org.springblade.desk.quality.util.PowerJobUtil; import org.springframework.stereotype.Service; @@ -81,6 +82,16 @@ public class LiquidTankService { return R.status(genService.updateById(lt)); } + /** + * 批量设置 + * + * @param lt + * @return + */ + public R updateBat(LiquidTankUpdateBat lt) { + return null; + } + public R delete() { return null; } @@ -124,4 +135,6 @@ public class LiquidTankService { private void handleJob(LiquidTankSubmit lt) { } + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java index 7956e35..3cdeee9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java @@ -340,19 +340,33 @@ public class LiquidTankTaskService { } /** - * [槽液检测任务] 结束 + * [槽液检测任务] 关闭 * @param req * @return */ - public R finishForce(LiquidTankTaskFinish req) { + public R close(LiquidTankTaskClose req) { LiquidTankTask task = genMapper.selectById(req.getId()); R r = new R<>(); r.setData(task); r.setSuccess(true); - r.setMsg("结束槽液任务成功"); + r.setMsg("关闭槽液任务成功"); return r; } + /** + * [槽液检测任务] 关闭 + * @param req + * @return + */ + public R closeBat(LiquidTankTaskCloseBat req) { + LiquidTankTask task = null; + R r = new R<>(); + r.setData(task); + r.setSuccess(true); + r.setMsg("关闭槽液任务成功"); + return null; + } + /** * 计算加药量 * 根据历史填报 or 药品规格自动修正加药量