From 232b1af5b07035b9bb87a487c6328b4dd6f9caa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 20 Apr 2026 21:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87BUG?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkOrderController.java | 3 +- .../workorder/service/IWorkOrderService.java | 3 +- .../service/impl/WorkOrderServiceImpl.java | 54 ++++++++++--------- .../mapper/xml/DeviceManagerMapper.xml | 3 +- .../impl/DsElectricityMeterServiceImpl.java | 2 +- .../service/impl/CameraInfoServiceImpl.java | 2 +- 6 files changed, 37 insertions(+), 30 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java index a31a48a..b274a8d 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/controller/WorkOrderController.java @@ -293,7 +293,6 @@ public class WorkOrderController extends JeecgController handFk(@RequestBody WorkOrder workOrder) { - workOrderService.handFk(workOrder); - return Result.OK("操作成功!"); + return workOrderService.handFk(workOrder); } } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java index 6303b23..7bbc528 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/IWorkOrderService.java @@ -2,6 +2,7 @@ package com.nu.modules.workorder.service; import com.nu.modules.workorder.entity.WorkOrder; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.common.api.vo.Result; import javax.servlet.http.HttpServletRequest; @@ -19,5 +20,5 @@ public interface IWorkOrderService extends IService { void saveHjpz(WorkOrder workOrder, HttpServletRequest request); - void handFk(WorkOrder workOrder); + Result handFk(WorkOrder workOrder); } diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java index 56c8343..fa4fa74 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/workorder/service/impl/WorkOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.nu.modules.workorder.mapper.WorkOrderMapper; import com.nu.modules.workorder.service.IWorkOrderService; import com.nu.utils.RabbitMQUtil; import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.entity.SysDepartEntity; import org.jeecg.common.system.vo.LoginUser; @@ -103,29 +104,34 @@ public class WorkOrderServiceImpl extends ServiceImpl handFk(WorkOrder workOrder) { + try { + WorkOrder upData = new WorkOrder(); + upData.setId(workOrder.getId()); + upData.setStatus("3");//平台搭建完成 + upData.setReplyTime(new Date()); + baseMapper.updateById(upData); + WorkOrder workInfo = baseMapper.selectById(workOrder.getId()); + SysDepartEntity orgInfo = sysBaseAPI.queryOrgInfoById(workOrder.getOrgId()); + WorkOrderMQDto workOrderMQDto = new WorkOrderMQDto(); + BeanUtils.copyProperties(workInfo, workOrderMQDto); + workOrderMQDto.setOrgId(workInfo.getOrgId()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + workOrderMQDto.setHandleBy(sysUser.getRealname()); + workOrderMQDto.setReplyTime(new Date()); + workOrderMQDto.setUrl(orgInfo.getUrl()); + workOrderMQDto.setMediaUrl(orgInfo.getMediaUrl()); + workOrderMQDto.setFrontPath(orgInfo.getFrontPath()); + workOrderMQDto.setContextPath(orgInfo.getContextPath()); + OrgInfo orgInfo_ = orgInfoService.getById(workOrder.getOrgId()); + OrgApplyInfoMQDto orgApplyInfoMQDto = new OrgApplyInfoMQDto(); + BeanUtils.copyProperties(orgInfo_, orgApplyInfoMQDto); + workOrderMQDto.setOrgInfo(orgApplyInfoMQDto); + rabbitMQUtil.sendToExchange("nu.workOrder", "nu.workOrder.handFk", workOrderMQDto); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("操作失败，请稍后重试！"); + } + return Result.OK("操作成功!"); } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml index 8e89304..023dc9e 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/device/manager/mapper/xml/DeviceManagerMapper.xml @@ -522,7 +522,8 @@ sn, factory, opt_date, - opt_type + opt_type, + remarks from nu_iot_device_bind_log where org_code = #{params.orgCode} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java index 208a997..3acb29d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/dingshuo/electricity/service/impl/DsElectricityMeterServiceImpl.java @@ -282,7 +282,6 @@ public class DsElectricityMeterServiceImpl extends ServiceImpl