|
@@ -5,6 +5,7 @@ import cn.hutool.http.HttpUtil;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.muzhi.tianhe.service.AccessTokenService;
|
|
import com.muzhi.tianhe.service.AccessTokenService;
|
|
|
|
+import com.muzhi.tianhe.util.PublicUtil;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -24,10 +25,16 @@ public class TbApiService {
|
|
|
|
|
|
public static String DING_CORP_ID = "dinga41ec6a58a4911d0f2c783f7214b6d69";
|
|
public static String DING_CORP_ID = "dinga41ec6a58a4911d0f2c783f7214b6d69";
|
|
public static String tbOrganizationId = "65b1dca21ab0fa13be993595";
|
|
public static String tbOrganizationId = "65b1dca21ab0fa13be993595";
|
|
|
|
+ public static String tbOperatorId = "65b1dc8355d0f38026a1c3db"; // guhuchen
|
|
|
|
|
|
public JSONArray getProjectList(){
|
|
public JSONArray getProjectList(){
|
|
- JSONObject result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/project/query?pageSize=1000"));
|
|
|
|
- return result.getJSONArray("result");
|
|
|
|
|
|
+ JSONObject result=new JSONObject();
|
|
|
|
+ JSONArray array=new JSONArray();
|
|
|
|
+ do {
|
|
|
|
+ result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/project/query?pageSize=1000&pageToken="+result.getString("nextPageToken")));
|
|
|
|
+ array.addAll(result.getJSONArray("result"));
|
|
|
|
+ }while (!PublicUtil.isNull(result.getString("nextPageToken")));
|
|
|
|
+ return array;
|
|
}
|
|
}
|
|
|
|
|
|
public JSONArray getProjectInfo(String projectId){
|
|
public JSONArray getProjectInfo(String projectId){
|
|
@@ -45,6 +52,35 @@ public class TbApiService {
|
|
return result.getJSONArray("result");
|
|
return result.getJSONArray("result");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public JSONArray getTasksInfo(String taskId){
|
|
|
|
+ JSONObject result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/task/query?taskId="+taskId));
|
|
|
|
+ return result.getJSONArray("result");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public JSONArray getTasksByParent(String parentTaskId){
|
|
|
|
+ JSONObject result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/task/query?parentTaskId="+parentTaskId));
|
|
|
|
+ return result.getJSONArray("result");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public JSONArray getProjectTfid(String projectId,String q){
|
|
|
|
+ JSONObject result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/project/"+projectId+"/taskflow/search?q="+q));
|
|
|
|
+ return result.getJSONArray("result");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public JSONArray getProjectStateId(String projectId,String q,String tfIds,String tfsIds){
|
|
|
|
+ JSONObject result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/project/"+projectId+"/taskflowstatus/search?q="+q+"&tfIds="+tfIds+"&tfsIds="+tfsIds));
|
|
|
|
+ return result.getJSONArray("result");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public Object updateTaskStatus(String taskId,String taskflowstatusId){
|
|
|
|
+ Map map=new HashMap();
|
|
|
|
+ map.put("taskflowstatusId",taskflowstatusId);
|
|
|
|
+ JSONObject result=header(HttpRequest.put(PRIVATE_API_URL + "/v3/task/{taskId}/taskflowstatus".replace("{taskId}",taskId))
|
|
|
|
+ .header("x-operator-id",tbOperatorId)
|
|
|
|
+ .body(JSONObject.toJSONString(map)));
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
public JSONArray getProjectCust(String projectId){
|
|
public JSONArray getProjectCust(String projectId){
|
|
JSONObject result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/project/"+ projectId +"/status/customfield/list"));
|
|
JSONObject result=header(HttpRequest.get(PRIVATE_API_URL + "/v3/project/"+ projectId +"/status/customfield/list"));
|
|
return result.getJSONArray("result");
|
|
return result.getJSONArray("result");
|
|
@@ -66,10 +102,7 @@ public class TbApiService {
|
|
}
|
|
}
|
|
|
|
|
|
public JSONArray getProjectState(String projectId){
|
|
public JSONArray getProjectState(String projectId){
|
|
- Map param = new HashMap();
|
|
|
|
- param.put("pageSize", 1000);
|
|
|
|
- JSONObject result=header(HttpUtil.createGet(PRIVATE_API_URL + "/v3/project/{projectId}/status/list".replace("{projectId}",projectId))
|
|
|
|
- .form(param));
|
|
|
|
|
|
+ JSONObject result=header(HttpUtil.createGet(PRIVATE_API_URL + "v3/project/{projectId}/taskflowstatus/search".replace("{projectId}",projectId)));
|
|
return result.getJSONArray("result");
|
|
return result.getJSONArray("result");
|
|
}
|
|
}
|
|
|
|
|