From 70128d7b10a9fe75ca974c3f282c3e2347a26489 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Tue, 19 Nov 2024 00:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/web/controller/app/EqHomeController.java | 12 ++++++++++++ .../web/service/impl/EqEquipmentServiceImpl.java | 1 + .../dromara/web/utils/WebSocketBusinessHandler.java | 5 +++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java index e92364e93..0a24adfba 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java @@ -3,6 +3,7 @@ package org.dromara.web.controller.app; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.secure.BCrypt; +import cn.hutool.core.bean.BeanUtil; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -325,6 +326,17 @@ public class EqHomeController extends BaseController { @Log(title = "分布管理", businessType = BusinessType.DELETE) @DeleteMapping("/areaIdsDelete/{areaIds}") public R areaIdsDelete(@NotEmpty(message = "主键不能为空") @PathVariable Long[] areaIds) { + if (areaIds.length>1) return R.fail("请选择一条数据进行删除"); + EqEquipmentBo eqEquipmentBo = new EqEquipmentBo(); + eqEquipmentBo.setAreaId(areaIds[0]); + List eqEquipmentVos = eqEquipmentService.queryList(eqEquipmentBo); + if (!eqEquipmentVos.isEmpty()){ + List bos = BeanUtil.copyToList(eqEquipmentVos, EqEquipmentBo.class); + for (EqEquipmentBo bo : bos) { + bo.setAreaId(null); + eqEquipmentService.updateByBo(bo); + } + } return toAjax(eqAreaService.deleteWithValidByIds(List.of(areaIds), true)); } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 0a5e5491b..f511e21e1 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -259,6 +259,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { @Override public EqEquipmentDetailVo getDeviceMsg(EqAppHomeBo bo) { + log.info("OpenStatusText开合状态:{},{}",MessageUtils.message("openStatus.name0"),MessageUtils.message("openStatus.name1")); EqEquipmentDetailVo result = new EqEquipmentDetailVo(); result.setEquipmentId(bo.getEquipmentId()); result.setEquipmentCode(bo.getEquipmentCode()); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java b/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java index 89425ca5a..03aedde5a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java @@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.Constants; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisUtils; @@ -65,7 +66,7 @@ public class WebSocketBusinessHandler implements WebSocketApi { } // EqEquipmentDetailVo data = deviceMsg.getData(); - sendMsg = JSON.toJSONString(deviceMsg); + sendMsg = JsonUtils.toJsonString(deviceMsg); log.info("socket详情发送：{}",sendMsg); sendMsg(sendMsg,loginUser.getUserId()); } @@ -99,7 +100,7 @@ public class WebSocketBusinessHandler implements WebSocketApi { log.error("获取设备列表失败：{}",e.getMessage()); } } - sendMsg = isTure?JSON.toJSONString(list):sendMsg; + sendMsg = isTure? JsonUtils.toJsonString(list):sendMsg; log.info("socket列表发送：{}",sendMsg); sendMsg(sendMsg,loginUser.getUserId()); }