diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricIntegrateService.java b/outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricIntegrateService.java index fb0676f6..d0502b3f 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricIntegrateService.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/lyric/LyricIntegrateService.java @@ -365,11 +365,11 @@ public class LyricIntegrateService { public SdmResponse pushFreeLinkMsg(FreelinkAndDingdingInformReq req){ SdmResponse response = SdmResponse.success(); - String token = getHKCloudToken(req.getJobNo()); +// String token = getHKCloudToken(req.getJobNo()); - if (token == null || token.isEmpty()) { - return SdmResponse.failed("获取海葵云token失败"); - } +// if (token == null || token.isEmpty()) { +// return SdmResponse.failed("获取海葵云token失败"); +// } FreeLinkMsg freeLinkMsg = req.getFreeLinkMsg(); List params = new ArrayList<>(); @@ -383,7 +383,7 @@ public class LyricIntegrateService { String getProcessDataUrl=FREELINK_URL+FREELINK_PUSH_MSG_SUFFIX; Map headerMap = new HashMap<>(); headerMap.put("Content-Type","application/x-www-form-urlencoded"); - headerMap.put("authorization", token); +// headerMap.put("authorization", token); try { String result = HttpUtil.httpPostForm(getProcessDataUrl, headerMap, params); diff --git a/pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java b/pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java index af029874..26338613 100644 --- a/pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java +++ b/pbs/src/main/java/com/sdm/pbs/controller/TestSecondDbController.java @@ -1,10 +1,12 @@ package com.sdm.pbs.controller; import com.sdm.common.common.SdmResponse; +import com.sdm.outbridge.entity.*; import com.sdm.outbridge.mode.FreelinkAndDingdingInformReq; import com.sdm.outbridge.mode.GetProcessDataReq; import com.sdm.outbridge.mode.HkUploadFileReq; -import com.sdm.outbridge.service.lyric.LyricIntegrateService; +import com.sdm.outbridge.service.lyric.*; +import com.sdm.pbs.service.TestService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; @@ -17,13 +19,30 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/sec") +@RequestMapping @Tag(name = "测试外部模块系统交互", description = "测试外部模块系统交互") public class TestSecondDbController { /*利元亨现场对接接口方法*/ @Autowired private LyricIntegrateService lyricIntegrateService; + @Autowired + private LyricVMainPlanDMService lyricVMainPlanDMService; + @Autowired + private LyricVPdtDmService lyricVPdtDmService; + @Autowired + private LyricVProductionLineToDmService lyricVProductionLineToDmService; + @Autowired + private LyricVProjectBatchToDmService lyricVProjectBatchToDmService; + @Autowired + private LyricVProjectToDmService lyricVProjectToDmService; + @Autowired + private LyricVTodoInfoService lyricVTodoInfoService; + + + @Autowired + private TestService testService; + // mock @@ -83,48 +102,57 @@ public class TestSecondDbController { } -// /*现场查询视图的方法mock */ -// @GetMapping("/getTodoInfoDm") no usages -// @Operation(summary = "查询代办") -// public SdmResponse> getTodoInfoDm() { -// // 查询从数据源 -// List todoInfoList = lyricVTodoInfoService.lambdaQuery().last(lastSql: "limit 2").list(); -// return SdmResponse.success(todoInfoList); -// } -// -// @GetMapping("/getPdtDm") no usages -// @Operation(summary = "查询项目Pdt") -// public SdmResponse> getPdtDm() { -// // 查询从数据源 -// List lyricVPdtToDMList = LyricVPdtDmService.lambdaQuery().last(lastSql: "limit 2").list(); -// return SdmResponse.success(lyricVPdtToDMList); -// } -// -// @GetMapping("/getMain") no usages -// @Operation(summary = "查询主计划") -// public SdmResponse> getMain() { -// // 查询从数据源 -// List mainPlanDMSList = lyricVMainPlanDMService.lambdaQuery().last(lastSql: "limit 2").list(); -// return SdmResponse.success(mainPlanDMSList); -// } -// -// @GetMapping("/getProductLine") no usages -// @Operation(summary = "查询产线信息") -// public SdmResponse> getProductLine() { -// // 查询从数据源 -// List productionLineToDMList = lyricVProductionLineToDmService -// .lambdaQuery().last(lastSql: "limit 2").list(); -// return SdmResponse.success(productionLineToDMList); -// } -// -// @GetMapping("/getProjectInfo") no usages -// @Operation(summary = "查询项目信息") -// public SdmResponse> getProjectInfo() { -// // 查询从数据源 -// List projectToDmList = LyricVProjectToDmService -// .lambdaQuery().last(lastSql: "limit 3").list(); -// return SdmResponse.success(projectToDmList); -// } + /*现场查询视图的方法mock */ + @GetMapping("/getTodoInfoDm") + @Operation(summary = "查询代办") + public SdmResponse> getTodoInfoDm() { + // 查询从数据源 + List todoInfoList = lyricVTodoInfoService.lambdaQuery().last( "limit 2").list(); + return SdmResponse.success(todoInfoList); + } + + @GetMapping("/getPdtDm") + @Operation(summary = "查询项目Pdt") + public SdmResponse> getPdtDm() { + // 查询从数据源 + List lyricVPdtToDMList =lyricVPdtDmService.lambdaQuery().last( "limit 2").list(); + return SdmResponse.success(lyricVPdtToDMList); + } + + @GetMapping("/getMain") + @Operation(summary = "查询主计划") + public SdmResponse> getMain() { + // 查询从数据源 + List mainPlanDMSList = lyricVMainPlanDMService.lambdaQuery().last("limit 2").list(); + return SdmResponse.success(mainPlanDMSList); + } + + @GetMapping("/getProductLine") + @Operation(summary = "查询产线信息") + public SdmResponse> getProductLine() { + // 查询从数据源 + List productionLineToDMList = lyricVProductionLineToDmService + .lambdaQuery().last( "limit 2").list(); + return SdmResponse.success(productionLineToDMList); + } + + @GetMapping("/getProjectBatch") + @Operation(summary = "查询批次信息") + public SdmResponse> getProjectBatch() { + // 查询从数据源 + List list = lyricVProjectBatchToDmService + .lambdaQuery().last("limit 2").list(); + return SdmResponse.success(list); + } + + @GetMapping("/getProjectInfo") + @Operation(summary = "查询项目信息") + public SdmResponse> getProjectInfo() { + // 查询从数据源 + List projectToDmList = + lyricVProjectToDmService.lambdaQuery().last("limit 3").list(); + return SdmResponse.success(projectToDmList); + } diff --git a/pbs/src/main/resources/application-lyric.yml b/pbs/src/main/resources/application-lyric.yml index 63cd3123..f68dd2e7 100644 --- a/pbs/src/main/resources/application-lyric.yml +++ b/pbs/src/main/resources/application-lyric.yml @@ -138,4 +138,15 @@ security: paths: - /pbs/jobFileCallback - /pbs/netTest - - /pbs/adapterSubmitHpcJob \ No newline at end of file + - /pbs/adapterSubmitHpcJob + - /getHkUserInfo + - /uploadHkFile + - /getProcessData + - /pushFreeLinkMsg + - /queryTodoAttachments + - /getTodoInfoDm + - /getPdtDm + - /getMain + - /getProductLine + - /getProjectBatch + - /getProjectInfo \ No newline at end of file