From 4cdd1fd2c21bbc071d947caae538c91946c0e08f Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Tue, 16 May 2023 14:09:19 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-16=2014:08:35=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E7=AE=A1=E7=90=86=E7=9A=84=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E5=88=A0=E3=80=81=E6=94=B9=E3=80=81=E6=9F=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/mapper/PsdcSceneMapper.java | 16 ++++++++++++++- .../com/psdc/service/IPsdcSceneService.java | 10 ++++------ .../service/impl/PsdcSceneServiceImpl.java | 20 +++++++++++-------- .../mapper/business/PsdcSceneMapper.xml | 13 ++++++++---- .../manager/PsdcSceneController.java | 12 ++++++++--- 5 files changed, 49 insertions(+), 22 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java index f35b22f..1ffc174 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcSceneMapper.java @@ -34,11 +34,25 @@ public interface PsdcSceneMapper{ */ int insert(PsdcScene psdcScene); - + /** + * 新增场景策略 + * @param sceneList + */ void InsertSceneData(@Param(value = "sceneRecord") List sceneList); + /** + * 修改场景策略 + * @param sceneList + */ void UpdateSceneData(@Param(value = "sceneRecord") List sceneList); + /** + * 通过策略名称删除场景策略 + * @param sceneName + * @return + */ + Integer deleteBySceneName(@Param(value = "sceneName") String sceneName); + /** * 更新数据 * diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcSceneService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcSceneService.java index e989d10..8facf8b 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcSceneService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcSceneService.java @@ -21,7 +21,6 @@ public interface IPsdcSceneService { /** * 新增数据 - * * @param scenes 实例对象集合 * @return */ @@ -31,18 +30,17 @@ public interface IPsdcSceneService { /** * 更新数据 - * * @param scenes 实例对象 * @return 实例对象 */ Boolean update(List scenes); + /** - * 通过主键删除数据 - * - * @param sceneId 主键 + * 通过策略名称删除数据 + * @param sceneName * @return 是否成功 */ - boolean deleteById(Integer sceneId); + Boolean deleteBySceneName(String sceneName); List> getStrategyList(); diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java index 45c9c3a..481f38c 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java @@ -91,18 +91,22 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { } } - - /** - * 通过主键删除数据 - * - * @param sceneId 主键 + /** + * 通过策略名称删除数据 + * @param sceneName * @return 是否成功 */ - public boolean deleteById(Integer sceneId){ - int total = psdcSceneMapper.deleteById(sceneId); - return total > 0; + @Override + public Boolean deleteBySceneName(String sceneName) { + int count = psdcSceneMapper.deleteBySceneName(sceneName); + if (count > 0){ + return true; + } else { + return false; + } } + @Override public List> getStrategyList() { List scenes = psdcSceneMapper.querySceneGroup(SecurityUtils.getUserId()); diff --git a/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml index f66cc38..3481f13 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcSceneMapper.xml @@ -115,12 +115,17 @@ delete from psdc_scene where scene_id = #{sceneId} + + Delete From psdc_scene Where scene_name = #{sceneName} + + diff --git a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java index f422a6e..9076c22 100644 --- a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java +++ b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java @@ -3,14 +3,11 @@ package com.psdc.controller.manager; import com.psdc.annotation.Log; import com.psdc.core.controller.BaseController; import com.psdc.core.domain.AjaxResult; -import com.psdc.core.domain.entity.SysUser; import com.psdc.core.page.TableDataInfo; import com.psdc.entity.PsdcScene; import com.psdc.entity.vo.SceneVo; import com.psdc.enums.BusinessType; import com.psdc.service.IPsdcSceneService; -import com.psdc.utils.SecurityUtils; -import com.psdc.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -78,5 +75,14 @@ public class PsdcSceneController extends BaseController { return toAjax(psdcSceneService.update(scenes)); } + /** + * 删除场景策略 + */ + @PreAuthorize("@ss.hasPermi('system:cl:list')") + @Log(title = "策略管理", businessType = BusinessType.DELETE) + @DeleteMapping() + public AjaxResult remove(@RequestParam String sceneName) { + return toAjax(psdcSceneService.deleteBySceneName(sceneName)); + } }