From 06362f725caf414878f0e81ecb6f073ae18fae3a Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Tue, 24 Sep 2024 00:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WarnRulesController.java | 43 +++++++++++++++++ .../controller/WarnStrategyController.java | 26 +++++----- .../muyu/warning/mapper/WarnRulesMapper.java | 21 +++++++++ .../warning/service/IWarRulesService.java | 14 ++++++ .../service/impl/WarnRulesServiceImpl.java | 47 +++++++++++++++++++ .../mapper/platform/WarnRulesMapper.xml | 9 ++++ 6 files changed, 145 insertions(+), 15 deletions(-) create mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java create mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRulesMapper.java create mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarRulesService.java create mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRulesServiceImpl.java create mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java new file mode 100644 index 0000000..586619e --- /dev/null +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRulesController.java @@ -0,0 +1,43 @@ +package com.muyu.warning.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.warning.domain.WarnRule; +import com.muyu.warning.domain.WarnRuleDTO; +import com.muyu.warning.service.IWarRulesService; +import lombok.val; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @ClassName WarnRulesController + * @Description 描述 + * @Author Chen + * @Date 2024/9/23 21:07 + */ +@RestController +@RequestMapping("/rules") +public class WarnRulesController { + @Autowired + private IWarRulesService warnRulesService; + + /** + * 联查策略规则 联查 + */ + + @GetMapping("/list") + public Result> list() { + List list = warnRulesService.selectWarnRulesList(); + return Result.success(list); + } + + @PostMapping("/listAll") + public Result> listAll() { + List list = warnRulesService.selectWarnRulesListAll(); + return Result.success(list); + } +} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java index 9c29b1a..4f1b51f 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java @@ -2,8 +2,11 @@ package com.muyu.warning.controller; import java.util.Arrays; import java.util.List; + import jakarta.servlet.http.HttpServletResponse; + import javax.annotation.Resource; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -29,8 +32,7 @@ import com.muyu.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/strategy") -public class WarnStrategyController extends BaseController -{ +public class WarnStrategyController extends BaseController { @Resource private IWarnStrategyService warnStrategyService; @@ -39,8 +41,7 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warning:strategy:list") @GetMapping("/list") - public Result> list(WarnStrategy warnStrategy) - { + public Result> list(WarnStrategy warnStrategy) { startPage(); List list = warnStrategyService.selectWarnStrategyList(warnStrategy); return getDataTable(list); @@ -51,8 +52,7 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warning:strategy:export") @PostMapping("/export") - public void export(HttpServletResponse response, WarnStrategy warnStrategy) - { + public void export(HttpServletResponse response, WarnStrategy warnStrategy) { List list = warnStrategyService.selectWarnStrategyList(warnStrategy); ExcelUtil util = new ExcelUtil(WarnStrategy.class); util.exportExcel(response, list, "预警策略数据"); @@ -63,8 +63,7 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warning:strategy:query") @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { + public Result> getInfo(@PathVariable("id") Long id) { return success(warnStrategyService.selectWarnStrategyById(id)); } @@ -74,8 +73,7 @@ public class WarnStrategyController extends BaseController @RequiresPermissions("warning:strategy:add") @PostMapping public Result add( - @Validated @RequestBody WarnStrategy warnStrategy) - { + @Validated @RequestBody WarnStrategy warnStrategy) { if (warnStrategyService.checkIdUnique(warnStrategy)) { return error("新增 预警策略 '" + warnStrategy + "'失败，预警策略已存在"); } @@ -88,8 +86,7 @@ public class WarnStrategyController extends BaseController @RequiresPermissions("warning:strategy:edit") @PutMapping public Result edit( - @Validated @RequestBody WarnStrategy warnStrategy) - { + @Validated @RequestBody WarnStrategy warnStrategy) { if (!warnStrategyService.checkIdUnique(warnStrategy)) { return error("修改 预警策略 '" + warnStrategy + "'失败，预警策略不存在"); } @@ -100,9 +97,8 @@ public class WarnStrategyController extends BaseController * 删除预警策略 */ @RequiresPermissions("warning:strategy:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) { warnStrategyService.removeBatchByIds(Arrays.asList(ids)); return success(); } diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRulesMapper.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRulesMapper.java new file mode 100644 index 0000000..ef8c67c --- /dev/null +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRulesMapper.java @@ -0,0 +1,21 @@ +package com.muyu.warning.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.warning.domain.WarnRuleDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassName WarnRulesMapper + * @Description 描述 + * @Author Chen + * @Date 2024/9/23 21:07 + */ +@Mapper +public interface WarnRulesMapper extends BaseMapper { + @Select("select r.*,s.strategy_name FROM warn_rule r left join warn_strategy s on r.strategy_id=s.id") + List selectWarnRulesListAll(); + +} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarRulesService.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarRulesService.java new file mode 100644 index 0000000..868a2a6 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarRulesService.java @@ -0,0 +1,14 @@ +package com.muyu.warning.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.warning.domain.WarnRule; +import com.muyu.warning.domain.WarnRuleDTO; + +import java.util.List; + +public interface IWarRulesService extends IService { + List selectWarnRulesList(); + + List selectWarnRulesListAll(); + +} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRulesServiceImpl.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRulesServiceImpl.java new file mode 100644 index 0000000..f54fdb8 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRulesServiceImpl.java @@ -0,0 +1,47 @@ +package com.muyu.warning.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.muyu.warning.domain.WarnRule; +import com.muyu.warning.domain.WarnRuleDTO; +import com.muyu.warning.domain.WarnStrategy; +import com.muyu.warning.mapper.WarnRulesMapper; +import com.muyu.warning.service.IWarRulesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName WarnRulesServiceImpl + * @Description 描述 + * @Author Chen + * @Date 2024/9/23 22:02 + */ +@Service +public class WarnRulesServiceImpl + extends ServiceImpl + implements IWarRulesService { + + @Autowired + private WarnRulesMapper warnRulesMapper; + + @Override + public List selectWarnRulesList() { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAll(WarnRule.class) + .selectAs(WarnStrategy::getStrategyName, WarnRuleDTO::getStrategyName) + .leftJoin(WarnStrategy.class, WarnStrategy::getId, WarnRule::getStrategyId); + return this.list(wrapper); + } + + /** + * 双表查询 + * @return + */ + @Override + public List selectWarnRulesListAll() { + List list = warnRulesMapper.selectWarnRulesListAll(); + return list; + } +} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml new file mode 100644 index 0000000..a9ef466 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/mapper/platform/WarnRulesMapper.xml @@ -0,0 +1,9 @@ + + + + + + +