From e2e012c04c758105ea80458fd8876fb693f4e776 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Fri, 27 Mar 2026 09:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/device/controller/EquipmentController.java | 4 ++-- .../desk/quality/controller/InspectionTaskController.java | 6 +++--- .../scheduling/controller/EquipmentController.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java index 701be700..fb21e005 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java @@ -84,8 +84,8 @@ public class EquipmentController extends BladeController { log.error("设备的ID是"+equipment.getId()); EquipmentEntity detail = equipmentService.getById(equipment.getId()); log.error("设备数据000001: {}"+ detail); - JSONObject result = JSONObject.parseObject(detail.toString()); - log.error("设备数据: {}"+ result.toJSONString()); +// JSONObject result = JSONObject.parseObject(detail.toString()); +// log.error("设备数据: {}"+ result.toJSONString()); // EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); return R.data(detail); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index d5599e35..606683e2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -125,13 +125,13 @@ public class InspectionTaskController extends BladeController { log.error("[检验任务]id="+inspectionTask.getId()); InspectionTask detail = service.getById(inspectionTask.getId()); log.error("检验任务数据000001: {}"+ detail); - JSONObject result = JSONObject.parseObject(detail.toString()); - log.error("检验任务数据: {}"+ result.toJSONString()); +// JSONObject result = JSONObject.parseObject(detail.toString()); +// log.error("检验任务数据: {}"+ result.toJSONString()); // InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); // InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); InspectionTaskDetailVO detailDetailVO = new InspectionTaskDetailVO(); - BeanUtils.copyProperties(inspectionTask, detailDetailVO); + BeanUtils.copyProperties(detail, detailDetailVO); BladeUser user = AuthUtil.getUser(); // InspectionTaskListVO detailDetail = service.detailById(inspectionTask); service.setDetailVOValue(detailDetailVO); diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java index 086816a6..63f538e5 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java @@ -82,8 +82,8 @@ public class EquipmentController extends BladeController { log.error("设备的ID是"+equipment.getId()); EquipmentEntity detail = equipmentService.getById(equipment.getId()); log.error("设备数据000001: {}"+ detail); - JSONObject result = JSONObject.parseObject(detail.toString()); - log.error("设备数据: {}"+ result.toJSONString()); +// JSONObject result = JSONObject.parseObject(detail.toString()); +// log.error("设备数据: {}"+ result.toJSONString()); // EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); return R.data(detail); }