From 9e57c59ef51e3baf6999eb8936ac27c1774d416f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 19:55:18 +0800
Subject: [PATCH] 设备出库+入库+场景管理优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
index 2694505..3433b9e 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java
@@ -16,6 +16,9 @@
*/
package org.sxkj.fw.area.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
import org.sxkj.fw.area.param.FwDefenseSceneManagePageParam;
import org.sxkj.fw.area.entity.FwDefenseSceneManageEntity;
import org.sxkj.fw.area.vo.FwDefenseSceneManageVO;
@@ -26,6 +29,10 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.sxkj.fw.device.entity.FwDeviceEntity;
+import org.sxkj.fw.device.service.IFwDeviceService;
+
+import java.util.ArrayList;
import java.util.List;
/**
@@ -36,6 +43,9 @@
*/
@Service
public class FwDefenseSceneManageServiceImpl extends BaseServiceImpl<FwDefenseSceneManageMapper, FwDefenseSceneManageEntity> implements IFwDefenseSceneManageService {
+
+ @Autowired
+ private IFwDeviceService fwDeviceService;
@Override
public IPage<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage<FwDefenseSceneManageVO> page, FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam) {
@@ -56,10 +66,47 @@
@Override
public List<FwDefenseSceneManageExcel> exportFwDefenseSceneManage(Wrapper<FwDefenseSceneManageEntity> queryWrapper) {
List<FwDefenseSceneManageExcel> fwDefenseSceneManageList = baseMapper.exportFwDefenseSceneManage(queryWrapper);
- //fwDefenseSceneManageList.forEach(fwDefenseSceneManage -> {
+ // fwDefenseSceneManageList.forEach(fwDefenseSceneManage -> {
// fwDefenseSceneManage.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwDefenseSceneManage.getType()));
//});
return fwDefenseSceneManageList;
}
+ @Override
+ public boolean saveOrUpdateFwDefenseSceneManage(FwDefenseSceneManageEntity convert) {
+ boolean b = saveOrUpdate(convert);
+ if (b) {
+ // 启用设备
+ List<Long> deviceIdList = baseMapper.selectDeviceId(convert.getId());
+ return fwDeviceService.update(Wrappers.<FwDeviceEntity>lambdaUpdate()
+ .set(FwDeviceEntity::getIsEnabled, 1)
+ .in(FwDeviceEntity::getId, deviceIdList));
+ }
+ return false;
+ }
+
+ /**
+ * 删除场景管理
+ *
+ * @param longList
+ * @return
+ */
+ @Override
+ public boolean deleteFwDefenseSceneManage(List<Long> longList) {
+ boolean b = deleteLogic(longList);
+ if (b) {
+ // 1.遍历所有删除的场景管理ID
+ List<Long> AllDeviceId = new ArrayList<>();
+ for (Long sceneManageId : longList) {
+ // 2.获取场景管理下的所有设备ID
+ List<Long> deviceIdList = baseMapper.selectDeviceId(sceneManageId);
+ AllDeviceId.addAll(deviceIdList);
+ }
+ // 3.禁用设备
+ return fwDeviceService.update(Wrappers.<FwDeviceEntity>lambdaUpdate()
+ .set(FwDeviceEntity::getIsEnabled, 0)
+ .in(FwDeviceEntity::getId, AllDeviceId));
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3