diff --git a/src/main/java/com/xdap/self_development/config/BusinessDatabase.java b/src/main/java/com/xdap/self_development/config/BusinessDatabase.java index 863e2e7..2265585 100644 --- a/src/main/java/com/xdap/self_development/config/BusinessDatabase.java +++ b/src/main/java/com/xdap/self_development/config/BusinessDatabase.java @@ -2,6 +2,8 @@ package com.xdap.self_development.config; import com.definesys.mpaas.query.MpaasQuery; import com.definesys.mpaas.query.MpaasQueryFactory; +import com.xdap.common.constant.DatasourceConstant; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @@ -12,8 +14,11 @@ public class BusinessDatabase { @Resource private MpaasQueryFactory queryFactory; + @Value("${apaas.single.tenantId}") + private String tenantId; + @Bean public MpaasQuery getBusinessDatabase() { - return queryFactory.buildFromDatasource("xdap_app_223770822127386625"); + return queryFactory.buildFromDatasource(DatasourceConstant.XDAP_MYSQL_PREFIX + tenantId); } } diff --git a/src/main/java/com/xdap/self_development/controller/DeleteController.java b/src/main/java/com/xdap/self_development/controller/DeleteController.java index c14472e..ab8869b 100644 --- a/src/main/java/com/xdap/self_development/controller/DeleteController.java +++ b/src/main/java/com/xdap/self_development/controller/DeleteController.java @@ -2,22 +2,26 @@ package com.xdap.self_development.controller; import com.definesys.mpaas.common.http.Response; import com.definesys.mpaas.query.MpaasQueryFactory; +import com.xdap.motor.entity.SnowflakeIdWorker; +import com.xdap.runtime.service.RuntimeAppContextService; import com.xdap.self_development.common.UserPermissionGetter; import com.xdap.self_development.config.BusinessDatabase; -import com.xdap.self_development.pojo.*; +import com.xdap.self_development.feign.ApaasMyTokenFeign; +import com.xdap.self_development.feign.dto.AppTokenDTO; +import com.xdap.self_development.feign.dto.ProcessLaunchRequest; +import com.xdap.self_development.feign.dto.ProcessLaunchResponse; +import com.xdap.self_development.feign.dto.UserTokenDT0; +import com.xdap.self_development.pojo.ApprovalParameterChangeDetails; +import com.xdap.self_development.pojo.ApprovalPerson; import lombok.extern.slf4j.Slf4j; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; +import java.util.*; @Slf4j @RestController @@ -29,156 +33,123 @@ public class DeleteController { private UserPermissionGetter getter; @Resource private MpaasQueryFactory queryFactory; + @Autowired + private ApaasMyTokenFeign apaasMyTokenFeign; + @Resource + private RuntimeAppContextService runtimeAppContextService; + @Resource + private SnowflakeIdWorker snowflakeIdWorker; + @Value("${apaas.token.clientId}") + private String clientId; + @Value("${apaas.token.clientSecred}") + private String clientSecret; - @GetMapping("/getTables") - public Response getTables(String ztj, String z_wlms) { - Map map = new HashMap<>(); - List> list = queryFactory - .buildFromDatasource("yc_lrs_test_relsult") - .eq("ztj", ztj) - .eq("z_wlms", z_wlms) - .table("ads_prd_f_yfsjglpt_fdjlbjcjb") - .doQuery(); - List> list1 = queryFactory - .buildFromDatasource("yc_lrs_test_relsult") - .table("ads_prd_f_tc_flsxb") - .doQuery(); - map.put("ads_prd_f_yfsjglpt_fdjlbjcjb", list); - map.put("ads_prd_f_tc_flsxb", list1); - return Response.ok().data(map); + @GetMapping("submitApproval") + public Response submitApproval() { + String currentTenantId = runtimeAppContextService.getCurrentTenantId(); + String currentUserId = getter.getCurrentUserId(); + AppTokenDTO token = apaasMyTokenFeign.getAppToken( + "client_credentials", + clientId, + clientSecret + ); + + UserTokenDT0 userToken = apaasMyTokenFeign.getUserToken( + token.getAccess_token(), + currentUserId + ); + String formId = "693cce312153aa5a1ac8599b"; + String documentId = snowflakeIdWorker.nextId(); + ApprovalPerson approvalPerson = new ApprovalPerson(); + approvalPerson.getDetails().setParameterName("测试参数名11"); + approvalPerson.setPz(Collections.singletonList("100771325212057665536")); + approvalPerson.setSh(Collections.singletonList("100771325212057665536")); + approvalPerson.setJd(Collections.singletonList("100771325212057665536")); + approvalPerson.setDocumentId(documentId); + bd.getBusinessDatabase().doInsert(approvalPerson); + List documentIds = Collections.singletonList(documentId); + + // 调用接口 + ProcessLaunchResponse response = batchLaunch(userToken.getAccess_token(), formId, documentIds); + + // 处理响应 + if (response.isSuccess()) { + return Response.ok().data("流程批量发起成功:" + response.getMessage()); + } else { + return Response.error("流程批量发起失败:" + response.getMessage()); + } } - @GetMapping("getAll") - public Response getAll() { - List