From 72c49f3afa22c4f84760d57001e45a4fadf2d482 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 12 三月 2026 09:32:33 +0800
Subject: [PATCH] #升级JDK17
---
src/main/java/com/zy/asrs/service/impl/ApkBuildTaskServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ApkBuildTaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApkBuildTaskServiceImpl.java
index 2f08aa7..4c25202 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApkBuildTaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApkBuildTaskServiceImpl.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.entity.ApkBuildTask;
import com.zy.asrs.mapper.ApkBuildTaskMapper;
import com.zy.asrs.service.ApkBuildTaskService;
@@ -47,12 +47,24 @@
private String adbPath;
@Override
- public ApkBuildTask triggerBuild(String buildType, String repoAlias, String branch) throws Exception {
+ public ApkBuildTask triggerBuild(String buildType, String androidTarget, String repoAlias, String branch, String serverUrl) throws Exception {
+ // 妫�鏌ユ槸鍚︽湁姝ｅ湪杩涜涓殑浠诲姟锛堢姸鎬�0=绛夊緟涓紝1=鎵撳寘涓級
+ List<ApkBuildTask> pendingTasks = this.baseMapper.selectPendingTasks();
+ if (!pendingTasks.isEmpty()) {
+ ApkBuildTask runningTask = pendingTasks.get(0);
+ throw new RuntimeException("宸叉湁鎵撳寘浠诲姟姝ｅ湪杩涜涓紙ID: " + runningTask.getId()
+ + ", 椤圭洰: "
+ + (runningTask.getProjectName() != null ? runningTask.getProjectName() : runningTask.getRepoAlias())
+ + "锛夛紝璇风瓑寰呭畬鎴愬悗鍐嶅垱寤烘柊浠诲姟");
+ }
+
// 鏋勫缓璇锋眰JSON
JSONObject requestBody = new JSONObject();
requestBody.put("build_type", buildType);
+ requestBody.put("android_target", androidTarget);
requestBody.put("repo_alias", repoAlias);
requestBody.put("branch", branch);
+ requestBody.put("server_url", serverUrl);
// 鍙戦�佹墦鍖呰姹�
Map<String, Object> headers = new HashMap<>();
@@ -91,13 +103,13 @@
task.setQueueSize(queueSize);
task.setCreatedAt(new Date());
- this.insert(task);
+ this.save(task);
return task;
}
@Override
public ApkBuildTask refreshStatus(Long id) throws Exception {
- ApkBuildTask task = this.selectById(id);
+ ApkBuildTask task = this.getById(id);
if (task == null) {
throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
}
@@ -182,7 +194,7 @@
@Override
public String downloadApk(Long id) throws Exception {
- ApkBuildTask task = this.selectById(id);
+ ApkBuildTask task = this.getById(id);
if (task == null) {
throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
}
@@ -256,7 +268,7 @@
@Override
public String installApk(Long id, String deviceIp) throws Exception {
- ApkBuildTask task = this.selectById(id);
+ ApkBuildTask task = this.getById(id);
if (task == null) {
throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
}
--
Gitblit v1.9.1