镀种相关。

develop-QA
Tom Li 3 months ago
parent 8f4bed6bdb
commit f024c92ea4
  1. 25
      blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskGenOneTimeProcessor.java
  2. 11
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java
  3. 5
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java
  4. 17
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java
  5. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java
  6. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java
  7. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java
  8. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java
  9. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java
  10. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java
  11. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
  12. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/CycleTestTaskClient.java
  13. 18
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java
  14. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java
  15. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java
  16. 18
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@ -1,25 +0,0 @@
package org.springblade.job.processor.quality;
import jakarta.annotation.Resource;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springblade.desk.quality.feign.ICycleTestTaskClient;
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 CycleTestTaskGenOneTimeProcessor implements BasicProcessor {
@Resource
private ICycleTestTaskClient client;
@Override
public ProcessResult process(TaskContext context) throws Exception {
client.generateOneTime();
return new ProcessResult(true);
}
}

@ -3,6 +3,7 @@
*/ */
package org.springblade.desk.basic.pojo.vo; package org.springblade.desk.basic.pojo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springblade.desk.basic.pojo.entity.Plating; import org.springblade.desk.basic.pojo.entity.Plating;
@ -21,4 +22,14 @@ public class PlatingVO extends Plating {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* [镀种分类]Name
*/
@Schema(description = "[镀种分类]Name")
private Long bcName;
/**
* [镀种小类]Name
*/
@Schema(description = "[镀种小类]Name")
private Long subClassName;
} }

@ -13,8 +13,6 @@ public interface ICycleTestTaskClient {
String GENERATE_AUTO = API_PREFIX + "/generate-auto"; String GENERATE_AUTO = API_PREFIX + "/generate-auto";
String GENERATE_ONE_TIME = API_PREFIX + "/generate-one-time";
String CHECK_REMIND = API_PREFIX + "/check-redmind"; String CHECK_REMIND = API_PREFIX + "/check-redmind";
String CHECK_OUT = API_PREFIX + "/check-out"; String CHECK_OUT = API_PREFIX + "/check-out";
@ -22,9 +20,6 @@ public interface ICycleTestTaskClient {
@GetMapping(GENERATE_AUTO) @GetMapping(GENERATE_AUTO)
void generateAuto(); void generateAuto();
@GetMapping(GENERATE_ONE_TIME)
void generateOneTime();
@GetMapping(CHECK_REMIND) @GetMapping(CHECK_REMIND)
void checkRemind(); void checkRemind();

@ -13,13 +13,18 @@ public interface ILquidTankTaskClient {
String API_PREFIX = "/feign/client/qa/lquid-tank-task"; String API_PREFIX = "/feign/client/qa/lquid-tank-task";
String GENERATE = API_PREFIX + "/generate"; String GENERATE_AUTO = API_PREFIX + "/generate-auto";
String TIMEOUT = API_PREFIX + "/timeout"; String CHECK_REMIND = API_PREFIX + "/check-redmind";
@GetMapping(GENERATE) String CHECK_OUT = API_PREFIX + "/check-out";
public List generate();
@GetMapping(TIMEOUT) @GetMapping(GENERATE_AUTO)
public List timeout(); void generateAuto();
@GetMapping(CHECK_REMIND)
void checkRemind();
@GetMapping(CHECK_OUT)
void checkOut();
} }

@ -18,6 +18,7 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.CommonConstant;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
@ -116,6 +117,7 @@ public class BasicClazzController extends BladeController {
public R<List<BasicClazzVO>> listForSelectPlatingAssort() { public R<List<BasicClazzVO>> listForSelectPlatingAssort() {
LambdaQueryWrapper<BasicClazz> qw = Wrappers.lambdaQuery(); LambdaQueryWrapper<BasicClazz> qw = Wrappers.lambdaQuery();
qw.eq(BasicClazz::getBizType, BasicClazzConst.TYPE_PLATING_ASSORT); qw.eq(BasicClazz::getBizType, BasicClazzConst.TYPE_PLATING_ASSORT);
qw.eq(BasicClazz::getIsDeleted, CommonConstant.DELETE_FALSE);
List<BasicClazz> list = service.list(qw); List<BasicClazz> list = service.list(qw);
List<BasicClazzVO> listVO = BasicClazzWrapper.build().listVO(list); List<BasicClazzVO> listVO = BasicClazzWrapper.build().listVO(list);
return R.data(listVO); return R.data(listVO);

@ -35,7 +35,6 @@ import org.springblade.desk.basic.pojo.vo.PlatingVO;
import org.springblade.desk.basic.service.IPlatingService; import org.springblade.desk.basic.service.IPlatingService;
import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.util.ExcelExtUtil;
import org.springblade.desk.basic.wrapper.PlatingWrapper; import org.springblade.desk.basic.wrapper.PlatingWrapper;
import org.springblade.desk.quality.pojo.entity.ReviewDuty;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -46,7 +45,7 @@ import java.util.stream.Collectors;
/** /**
* [镀种] 控制器 * [镀种] 控制器
* * mes v1: bs_plating
* @author Tom Shuo * @author Tom Shuo
* @since 2026-01-05 * @since 2026-01-05
*/ */

@ -41,6 +41,7 @@ import java.util.stream.Collectors;
/** /**
* [生产标识] 控制器 * [生产标识] 控制器
* mes v1:
* *
* @author Tom Shuo * @author Tom Shuo
* @since 2025-12-22 * @since 2025-12-22

@ -41,6 +41,7 @@ import java.util.stream.Collectors;
/** /**
* [班组用户关联] 控制器 * [班组用户关联] 控制器
* mes v1: 二期新加
* *
* @author Tom Shuo * @author Tom Shuo
* @since 2026-01-13 * @since 2026-01-13

@ -40,6 +40,7 @@ import java.util.Map;
/** /**
* [班组] 控制器 * [班组] 控制器
* mes v1: bs_team_set * mes v1: bs_team_set
*
* @author Tom Shuo * @author Tom Shuo
* @since 2025-12-16 * @since 2025-12-16
*/ */

@ -40,6 +40,7 @@ import java.util.Map;
/** /**
* [作业中心] 控制器 * [作业中心] 控制器
* mes v1: bs_work_center * mes v1: bs_work_center
*
* @author Tom Shuo * @author Tom Shuo
* @since 2025-12-16 * @since 2025-12-16
*/ */

@ -40,6 +40,7 @@ import java.util.Map;
/** /**
* [作业槽] 控制器 * [作业槽] 控制器
* mes v1: * mes v1:
*
* @author Tom Shuo * @author Tom Shuo
* @since 2025-12-16 * @since 2025-12-16
*/ */

@ -17,11 +17,6 @@ public class CycleTestTaskClient implements ICycleTestTaskClient {
service.generateAuto(); service.generateAuto();
} }
@Override
public void generateOneTime() {
service.generateOneTime();
}
@Override @Override
public void checkRemind() { public void checkRemind() {
service.checkRemind(); service.checkRemind();

@ -3,6 +3,9 @@ package org.springblade.desk.quality.feign;
import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Hidden;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
import org.springblade.desk.quality.service.ILiquidTankService;
import org.springblade.desk.quality.service.ILiquidTankTaskService;
import org.springblade.desk.quality.service.LiquidTankService2;
import org.springblade.desk.quality.service.LiquidTankTaskService222; import org.springblade.desk.quality.service.LiquidTankTaskService222;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -13,16 +16,21 @@ import java.util.List;
public class LiquidTankTaskClient implements ILquidTankTaskClient { public class LiquidTankTaskClient implements ILquidTankTaskClient {
@Resource @Resource
private LiquidTankTaskService222 service; private ILiquidTankTaskService service;
@Override @Override
public List<LiquidTankTask> generate() { public void generateAuto() {
return null;// todo: service.generateAuto();
} }
@Override @Override
public List<LiquidTankTask> timeout() { public void checkRemind() {
return service.timeout(); service.checkRemind();
}
@Override
public void checkOut() {
service.checkOut();
} }
} }

@ -278,10 +278,6 @@ public class CycleTestTaskService2 {
return true; return true;
} }
public void generateOneTime() {
List<CycleTest> ctList = cycleTestService.list();
}
/** /**
* 手动生成 * 手动生成
* *

@ -66,4 +66,10 @@ public interface ILiquidTankTaskService extends BaseService<LiquidTankTask> {
R finishFail(Long id, String finishReason); R finishFail(Long id, String finishReason);
void setVOValue(LiquidTankTaskVO vo); void setVOValue(LiquidTankTaskVO vo);
void generateAuto();
void checkRemind();
void checkOut();
} }

@ -293,17 +293,18 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
} }
/** /**
* todo:
* 定时运行:每天00:00 * 定时运行:每天00:00
* 周期性自动生成槽液任务 * 周期性自动生成槽液任务
* *
* @return 所有生成的任务 * @return 所有生成的任务
*/ */
public List<LiquidTankTask> generateAuto() { public void generateAuto() {
log.info("========generate========start"); log.info("========generate========start");
// 如果是节假日,则跳过生成。 // 如果是节假日,则跳过生成。 todo:
if (false) { if (false) {
log.info("节假日,则跳过生成。"); log.info("节假日,则跳过生成。");
return null; return;
} }
// 查询所有启用的槽液。 // 查询所有启用的槽液。
List<LiquidTank> tankList = liquidTankService.list( List<LiquidTank> tankList = liquidTankService.list(
@ -327,7 +328,16 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
rList.add(task); rList.add(task);
} }
log.info("========generate========end"); log.info("========generate========end");
return rList; }
@Override
public void checkRemind() {
// todo:
}
@Override
public void checkOut() {
// todo:
} }
/** /**

Loading…
Cancel
Save