From 49c504709c756c12fd40d9b8398a2cbe543c9a30 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Thu, 2 Apr 2026 13:33:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=95=E8=AE=B0=E5=BD=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PlanTestController.java | 10 ++- .../quality/service/IPlanTestService.java | 7 +++ .../service/impl/PlanTestServiceImpl.java | 62 ++++++++++++++++++- .../src/main/resources/application-dev.yml | 1 + 4 files changed, 77 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index dd23ea5b..0143a216 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java @@ -60,7 +60,7 @@ public class PlanTestController extends BladeController { /** * [转试记录] 详情 */ - @GetMapping("/detail") + @GetMapping("/detailPage") @ApiOperationSupport(order = 10) @Operation(summary = "详情", description = "传入PlanTest Obj") public R detail(PlanTest planTest) { @@ -71,6 +71,14 @@ public class PlanTestController extends BladeController { return R.data(detailVO); } + + @GetMapping(value = "/detail") + public R detailPage(PlanTest planTest) { + return R.data(service.detailPage(planTest)); + } + + + // @PostMapping(value = "/detailPage") // public R detailPage(@RequestBody JSONObject data) { // PrPlanTest prPlanTest = data.getObject("prPlanTest", PrPlanTest.class); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java index 1a4e3775..b9080ae0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.service; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; @@ -19,6 +20,12 @@ import java.util.List; * @since 2025-12-24 */ public interface IPlanTestService extends BaseService { + + + + JSONArray detailPage(PlanTest prPlanTest); + + /** * 自定义分页 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java index 18cecd97..0335a1b6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java @@ -3,6 +3,8 @@ */ package org.springblade.desk.quality.service.impl; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; @@ -12,6 +14,10 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; +import org.springblade.desk.produce.pojo.entity.WorkOrder; +import org.springblade.desk.produce.pojo.entity.WorkPlan; +import org.springblade.desk.produce.service.IWorkOrderService; +import org.springblade.desk.produce.service.IWorkPlanService; import org.springblade.desk.quality.excel.PlanTestExcel; import org.springblade.desk.quality.mapper.PlanTestMapper; import org.springblade.desk.quality.pojo.entity.PlanTest; @@ -20,7 +26,13 @@ import org.springblade.desk.quality.service.IPlanTestService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; import java.util.List; @@ -32,8 +44,8 @@ import java.util.List; */ @Service @Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) +//@AllArgsConstructor +//@EqualsAndHashCode(callSuper = true) @Slf4j public class PlanTestServiceImpl extends BaseServiceImpl implements IPlanTestService { @@ -41,6 +53,52 @@ public class PlanTestServiceImpl extends BaseServiceImpl entity = new HttpEntity<>(object, headers); + ResponseEntity responseEntity = null; + try { + responseEntity = httpClientTemplate.postForEntity(limsUrl + "/api/cloud-customized/zhonghanggd/zhgdMesLxDatasources/mesGetLxList", entity, JSONObject.class); + JSONObject result = responseEntity.getBody(); + if (result != null && result.getBoolean("success")) { + return result.getJSONObject("data"); + } else { + log.error("转试计划详情接口调用失败!" + result.getString("msg")); + } + } catch (Exception e) { + log.error("转试计划详情接口调用失败!" + e.getMessage()); + } + return null; + } @Override public IPage selectPlanTestPage(IPage page, PlanTestVO planTest) { diff --git a/blade-service/blade-desk/src/main/resources/application-dev.yml b/blade-service/blade-desk/src/main/resources/application-dev.yml index 67407e76..569eb8c6 100644 --- a/blade-service/blade-desk/src/main/resources/application-dev.yml +++ b/blade-service/blade-desk/src/main/resources/application-dev.yml @@ -49,6 +49,7 @@ role-config: request: newErp: url: "http://192.168.119.68:10113" + #用水用电接口请求地址(iot) iot: #热表分厂组织id(部门id)