From a41b5ec59dce472385ad33094fb72691dad127ca Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 05 三月 2024 11:00:59 +0800
Subject: [PATCH] 景区配置基础功能

---
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java                 |   41 ++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryInfoVo.java                   |   55 +++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryInfoController.java          |  105 +++++++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryInfoServiceImpl.java       |  112 +++++++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java                 |   56 +++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryInfoService.java               |   49 +++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java                      |   41 ++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java        |  105 +++++++
 dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryInfoMapper.xml                          |    7 
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerTotalServiceImpl.java       |    1 
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java |    1 
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java             |   49 +++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryInfo.java                        |   42 ++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java     |  112 +++++++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsIndicatorInfoMapper.java                |   15 +
 dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsIndicatorInfoMapper.xml                        |    7 
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryInfoBo.java                   |   41 ++
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryInfoMapper.java                  |   15 +
 dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java        |    1 
 19 files changed, 852 insertions(+), 3 deletions(-)

diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java
new file mode 100644
index 0000000..6d14507
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java
@@ -0,0 +1,105 @@
+package org.dromara.demo.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.demo.domain.vo.RsIndicatorInfoVo;
+import org.dromara.demo.domain.bo.RsIndicatorInfoBo;
+import org.dromara.demo.service.IRsIndicatorInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 鎸囨爣鍙栧��
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/demo/indicatorInfo")
+public class RsIndicatorInfoController extends BaseController {
+
+    private final IRsIndicatorInfoService rsIndicatorInfoService;
+
+    /**
+     * 鏌ヨ鎸囨爣鍙栧�煎垪琛�
+     */
+    @SaCheckPermission("demo:indicatorInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<RsIndicatorInfoVo> list(RsIndicatorInfoBo bo, PageQuery pageQuery) {
+        return rsIndicatorInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 瀵煎嚭鎸囨爣鍙栧�煎垪琛�
+     */
+    @SaCheckPermission("demo:indicatorInfo:export")
+    @Log(title = "鎸囨爣鍙栧��", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(RsIndicatorInfoBo bo, HttpServletResponse response) {
+        List<RsIndicatorInfoVo> list = rsIndicatorInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "鎸囨爣鍙栧��", RsIndicatorInfoVo.class, response);
+    }
+
+    /**
+     * 鑾峰彇鎸囨爣鍙栧�艰缁嗕俊鎭�
+     *
+     * @param id 涓婚敭
+     */
+    @SaCheckPermission("demo:indicatorInfo:query")
+    @GetMapping("/{id}")
+    public R<RsIndicatorInfoVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+                                     @PathVariable String id) {
+        return R.ok(rsIndicatorInfoService.queryById(id));
+    }
+
+    /**
+     * 鏂板鎸囨爣鍙栧��
+     */
+    @SaCheckPermission("demo:indicatorInfo:add")
+    @Log(title = "鎸囨爣鍙栧��", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody RsIndicatorInfoBo bo) {
+        return toAjax(rsIndicatorInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 淇敼鎸囨爣鍙栧��
+     */
+    @SaCheckPermission("demo:indicatorInfo:edit")
+    @Log(title = "鎸囨爣鍙栧��", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody RsIndicatorInfoBo bo) {
+        return toAjax(rsIndicatorInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 鍒犻櫎鎸囨爣鍙栧��
+     *
+     * @param ids 涓婚敭涓�
+     */
+    @SaCheckPermission("demo:indicatorInfo:remove")
+    @Log(title = "鎸囨爣鍙栧��", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+                          @PathVariable String[] ids) {
+        return toAjax(rsIndicatorInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryInfoController.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryInfoController.java
new file mode 100644
index 0000000..b27b0fb
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryInfoController.java
@@ -0,0 +1,105 @@
+package org.dromara.demo.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.demo.domain.vo.RsSceneryInfoVo;
+import org.dromara.demo.domain.bo.RsSceneryInfoBo;
+import org.dromara.demo.service.IRsSceneryInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 鏅尯閰嶇疆淇℃伅
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/demo/sceneryInfo")
+public class RsSceneryInfoController extends BaseController {
+
+    private final IRsSceneryInfoService rsSceneryInfoService;
+
+    /**
+     * 鏌ヨ鏅尯閰嶇疆淇℃伅鍒楄〃
+     */
+    @SaCheckPermission("demo:sceneryInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<RsSceneryInfoVo> list(RsSceneryInfoBo bo, PageQuery pageQuery) {
+        return rsSceneryInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 瀵煎嚭鏅尯閰嶇疆淇℃伅鍒楄〃
+     */
+    @SaCheckPermission("demo:sceneryInfo:export")
+    @Log(title = "鏅尯閰嶇疆淇℃伅", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(RsSceneryInfoBo bo, HttpServletResponse response) {
+        List<RsSceneryInfoVo> list = rsSceneryInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "鏅尯閰嶇疆淇℃伅", RsSceneryInfoVo.class, response);
+    }
+
+    /**
+     * 鑾峰彇鏅尯閰嶇疆淇℃伅璇︾粏淇℃伅
+     *
+     * @param id 涓婚敭
+     */
+    @SaCheckPermission("demo:sceneryInfo:query")
+    @GetMapping("/{id}")
+    public R<RsSceneryInfoVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+                                     @PathVariable String id) {
+        return R.ok(rsSceneryInfoService.queryById(id));
+    }
+
+    /**
+     * 鏂板鏅尯閰嶇疆淇℃伅
+     */
+    @SaCheckPermission("demo:sceneryInfo:add")
+    @Log(title = "鏅尯閰嶇疆淇℃伅", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody RsSceneryInfoBo bo) {
+        return toAjax(rsSceneryInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 淇敼鏅尯閰嶇疆淇℃伅
+     */
+    @SaCheckPermission("demo:sceneryInfo:edit")
+    @Log(title = "鏅尯閰嶇疆淇℃伅", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody RsSceneryInfoBo bo) {
+        return toAjax(rsSceneryInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 鍒犻櫎鏅尯閰嶇疆淇℃伅
+     *
+     * @param ids 涓婚敭涓�
+     */
+    @SaCheckPermission("demo:sceneryInfo:remove")
+    @Log(title = "鏅尯閰嶇疆淇℃伅", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+                          @PathVariable String[] ids) {
+        return toAjax(rsSceneryInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java
new file mode 100644
index 0000000..5669173
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java
@@ -0,0 +1,41 @@
+package org.dromara.demo.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 鎸囨爣鍙栧�煎璞� rs_indicator_info
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Data
+@TableName("rs_indicator_info")
+public class RsIndicatorInfo {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 鎸囨爣鍚嶇О
+     */
+    private String indicatorName;
+
+    /**
+     * 鐘舵�� 1鑷畾涔� 2鎸囨爣鍙栧��
+     */
+    private Long status;
+
+    private Date createTime;
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryInfo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryInfo.java
new file mode 100644
index 0000000..d6edad7
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsSceneryInfo.java
@@ -0,0 +1,42 @@
+package org.dromara.demo.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 鏅尯閰嶇疆淇℃伅瀵硅薄 rs_scenery_info
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Data
+@TableName("rs_scenery_info")
+public class RsSceneryInfo {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 鏅尯鍚嶇О
+     */
+    private String sceneryName;
+
+    /**
+     * 鎺掑簭
+     */
+    private Long sequence;
+
+    private Date createTime;
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java
new file mode 100644
index 0000000..6dc038e
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java
@@ -0,0 +1,41 @@
+package org.dromara.demo.domain.bo;
+
+import org.dromara.demo.domain.RsIndicatorInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 鎸囨爣鍙栧�间笟鍔″璞� rs_indicator_info
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = RsIndicatorInfo.class, reverseConvertGenerate = false)
+public class RsIndicatorInfoBo extends BaseEntity {
+
+    /**
+     * 缂栧彿
+     */
+    @NotBlank(message = "缂栧彿涓嶈兘涓虹┖", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 鎸囨爣鍚嶇О
+     */
+    private String indicatorName;
+
+    /**
+     * 鐘舵�� 1鑷畾涔� 2鎸囨爣鍙栧��
+     */
+    @NotNull(message = "鐘舵�� 1鑷畾涔� 2鎸囨爣鍙栧�间笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
+    private Long status;
+
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryInfoBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryInfoBo.java
new file mode 100644
index 0000000..db922f5
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryInfoBo.java
@@ -0,0 +1,41 @@
+package org.dromara.demo.domain.bo;
+
+import org.dromara.demo.domain.RsSceneryInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 鏅尯閰嶇疆淇℃伅涓氬姟瀵硅薄 rs_scenery_info
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = RsSceneryInfo.class, reverseConvertGenerate = false)
+public class RsSceneryInfoBo extends BaseEntity {
+
+    /**
+     * 缂栧彿
+     */
+    @NotBlank(message = "缂栧彿涓嶈兘涓虹┖", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 鏅尯鍚嶇О
+     */
+    @NotBlank(message = "鏅尯鍚嶇О涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+    private String sceneryName;
+
+    /**
+     * 鎺掑簭
+     */
+    @NotNull(message = "鎺掑簭涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+    private Long sequence;
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java
new file mode 100644
index 0000000..3bc8069
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java
@@ -0,0 +1,56 @@
+package org.dromara.demo.domain.vo;
+
+import org.dromara.demo.domain.RsIndicatorInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 鎸囨爣鍙栧�艰鍥惧璞� rs_indicator_info
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = RsIndicatorInfo.class)
+public class RsIndicatorInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @ExcelProperty(value = "缂栧彿")
+    private String id;
+
+    /**
+     * 鎸囨爣鍚嶇О
+     */
+    @ExcelProperty(value = "鎸囨爣鍚嶇О")
+    private String indicatorName;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ExcelProperty(value = "鍒涘缓鏃堕棿")
+    private Date createTime;
+
+    /**
+     * 鐘舵�� 1鑷畾涔� 2鎸囨爣鍙栧��
+     */
+    @ExcelProperty(value = "鐘舵�� 1鑷畾涔� 2鎸囨爣鍙栧��")
+    private Long status;
+
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryInfoVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryInfoVo.java
new file mode 100644
index 0000000..7cbaea4
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsSceneryInfoVo.java
@@ -0,0 +1,55 @@
+package org.dromara.demo.domain.vo;
+
+import org.dromara.demo.domain.RsSceneryInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 鏅尯閰嶇疆淇℃伅瑙嗗浘瀵硅薄 rs_scenery_info
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = RsSceneryInfo.class)
+public class RsSceneryInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @ExcelProperty(value = "缂栧彿")
+    private String id;
+
+    /**
+     * 鏅尯鍚嶇О
+     */
+    @ExcelProperty(value = "鏅尯鍚嶇О")
+    private String sceneryName;
+
+    /**
+     * 鎺掑簭
+     */
+    @ExcelProperty(value = "鎺掑簭")
+    private Long sequence;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ExcelProperty(value = "鍒涘缓鏃堕棿")
+    private Date createTime;
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsIndicatorInfoMapper.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsIndicatorInfoMapper.java
new file mode 100644
index 0000000..87d38e7
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsIndicatorInfoMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.demo.mapper;
+
+import org.dromara.demo.domain.RsIndicatorInfo;
+import org.dromara.demo.domain.vo.RsIndicatorInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 鎸囨爣鍙栧�糓apper鎺ュ彛
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+public interface RsIndicatorInfoMapper extends BaseMapperPlus<RsIndicatorInfo, RsIndicatorInfoVo> {
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryInfoMapper.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryInfoMapper.java
new file mode 100644
index 0000000..47f6afd
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/mapper/RsSceneryInfoMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.demo.mapper;
+
+import org.dromara.demo.domain.RsSceneryInfo;
+import org.dromara.demo.domain.vo.RsSceneryInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 鏅尯閰嶇疆淇℃伅Mapper鎺ュ彛
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+public interface RsSceneryInfoMapper extends BaseMapperPlus<RsSceneryInfo, RsSceneryInfoVo> {
+
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java
new file mode 100644
index 0000000..3bf0950
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java
@@ -0,0 +1,49 @@
+package org.dromara.demo.service;
+
+import org.dromara.demo.domain.RsIndicatorInfo;
+import org.dromara.demo.domain.vo.RsIndicatorInfoVo;
+import org.dromara.demo.domain.bo.RsIndicatorInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鎸囨爣鍙栧�糞ervice鎺ュ彛
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+public interface IRsIndicatorInfoService {
+
+    /**
+     * 鏌ヨ鎸囨爣鍙栧��
+     */
+    RsIndicatorInfoVo queryById(String id);
+
+    /**
+     * 鏌ヨ鎸囨爣鍙栧�煎垪琛�
+     */
+    TableDataInfo<RsIndicatorInfoVo> queryPageList(RsIndicatorInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 鏌ヨ鎸囨爣鍙栧�煎垪琛�
+     */
+    List<RsIndicatorInfoVo> queryList(RsIndicatorInfoBo bo);
+
+    /**
+     * 鏂板鎸囨爣鍙栧��
+     */
+    Boolean insertByBo(RsIndicatorInfoBo bo);
+
+    /**
+     * 淇敼鎸囨爣鍙栧��
+     */
+    Boolean updateByBo(RsIndicatorInfoBo bo);
+
+    /**
+     * 鏍￠獙骞舵壒閲忓垹闄ゆ寚鏍囧彇鍊间俊鎭�
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryInfoService.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryInfoService.java
new file mode 100644
index 0000000..824c875
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsSceneryInfoService.java
@@ -0,0 +1,49 @@
+package org.dromara.demo.service;
+
+import org.dromara.demo.domain.RsSceneryInfo;
+import org.dromara.demo.domain.vo.RsSceneryInfoVo;
+import org.dromara.demo.domain.bo.RsSceneryInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 鏅尯閰嶇疆淇℃伅Service鎺ュ彛
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+public interface IRsSceneryInfoService {
+
+    /**
+     * 鏌ヨ鏅尯閰嶇疆淇℃伅
+     */
+    RsSceneryInfoVo queryById(String id);
+
+    /**
+     * 鏌ヨ鏅尯閰嶇疆淇℃伅鍒楄〃
+     */
+    TableDataInfo<RsSceneryInfoVo> queryPageList(RsSceneryInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 鏌ヨ鏅尯閰嶇疆淇℃伅鍒楄〃
+     */
+    List<RsSceneryInfoVo> queryList(RsSceneryInfoBo bo);
+
+    /**
+     * 鏂板鏅尯閰嶇疆淇℃伅
+     */
+    Boolean insertByBo(RsSceneryInfoBo bo);
+
+    /**
+     * 淇敼鏅尯閰嶇疆淇℃伅
+     */
+    Boolean updateByBo(RsSceneryInfoBo bo);
+
+    /**
+     * 鏍￠獙骞舵壒閲忓垹闄ゆ櫙鍖洪厤缃俊鎭俊鎭�
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
index d00858a..fdcbcb8 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
@@ -93,7 +93,6 @@
     @Override
     public Boolean updateByBo(RsDangerInfoBo bo) {
         RsDangerInfo update = MapstructUtils.convert(bo, RsDangerInfo.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerTotalServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerTotalServiceImpl.java
index c5853cc..67cf3b7 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerTotalServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerTotalServiceImpl.java
@@ -94,7 +94,6 @@
     @Override
     public Boolean updateByBo(RsDangerTotalBo bo) {
         RsDangerTotal update = MapstructUtils.convert(bo, RsDangerTotal.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java
new file mode 100644
index 0000000..6a776f8
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java
@@ -0,0 +1,112 @@
+package org.dromara.demo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.demo.domain.RsIndicatorInfo;
+import org.dromara.demo.domain.bo.RsIndicatorInfoBo;
+import org.dromara.demo.domain.vo.RsIndicatorInfoVo;
+import org.dromara.demo.mapper.RsIndicatorInfoMapper;
+import org.dromara.demo.service.IRsIndicatorInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鎸囨爣鍙栧�糞ervice涓氬姟灞傚鐞�
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@RequiredArgsConstructor
+@Service
+public class RsIndicatorInfoServiceImpl implements IRsIndicatorInfoService {
+
+    private final RsIndicatorInfoMapper baseMapper;
+
+    /**
+     * 鏌ヨ鎸囨爣鍙栧��
+     */
+    @Override
+    public RsIndicatorInfoVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 鏌ヨ鎸囨爣鍙栧�煎垪琛�
+     */
+    @Override
+    public TableDataInfo<RsIndicatorInfoVo> queryPageList(RsIndicatorInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<RsIndicatorInfo> lqw = buildQueryWrapper(bo);
+        Page<RsIndicatorInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 鏌ヨ鎸囨爣鍙栧�煎垪琛�
+     */
+    @Override
+    public List<RsIndicatorInfoVo> queryList(RsIndicatorInfoBo bo) {
+        LambdaQueryWrapper<RsIndicatorInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<RsIndicatorInfo> buildQueryWrapper(RsIndicatorInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<RsIndicatorInfo> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getIndicatorName()), RsIndicatorInfo::getIndicatorName, bo.getIndicatorName());
+        lqw.eq(bo.getCreateTime() != null, RsIndicatorInfo::getCreateTime, bo.getCreateTime());
+        lqw.eq(bo.getStatus() != null, RsIndicatorInfo::getStatus, bo.getStatus());
+        lqw.orderByDesc(RsIndicatorInfo::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 鏂板鎸囨爣鍙栧��
+     */
+    @Override
+    public Boolean insertByBo(RsIndicatorInfoBo bo) {
+        RsIndicatorInfo add = MapstructUtils.convert(bo, RsIndicatorInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 淇敼鎸囨爣鍙栧��
+     */
+    @Override
+    public Boolean updateByBo(RsIndicatorInfoBo bo) {
+        RsIndicatorInfo update = MapstructUtils.convert(bo, RsIndicatorInfo.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
+     */
+    private void validEntityBeforeSave(RsIndicatorInfo entity){
+        entity.setCreateTime(new Date());
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鎸囨爣鍙栧��
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryInfoServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryInfoServiceImpl.java
new file mode 100644
index 0000000..01fa234
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsSceneryInfoServiceImpl.java
@@ -0,0 +1,112 @@
+package org.dromara.demo.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.demo.domain.bo.RsSceneryInfoBo;
+import org.dromara.demo.domain.vo.RsSceneryInfoVo;
+import org.dromara.demo.domain.RsSceneryInfo;
+import org.dromara.demo.mapper.RsSceneryInfoMapper;
+import org.dromara.demo.service.IRsSceneryInfoService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 鏅尯閰嶇疆淇℃伅Service涓氬姟灞傚鐞�
+ *
+ * @author gonghl
+ * @date 2024-03-04
+ */
+@RequiredArgsConstructor
+@Service
+public class RsSceneryInfoServiceImpl implements IRsSceneryInfoService {
+
+    private final RsSceneryInfoMapper baseMapper;
+
+    /**
+     * 鏌ヨ鏅尯閰嶇疆淇℃伅
+     */
+    @Override
+    public RsSceneryInfoVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 鏌ヨ鏅尯閰嶇疆淇℃伅鍒楄〃
+     */
+    @Override
+    public TableDataInfo<RsSceneryInfoVo> queryPageList(RsSceneryInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<RsSceneryInfo> lqw = buildQueryWrapper(bo);
+        Page<RsSceneryInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 鏌ヨ鏅尯閰嶇疆淇℃伅鍒楄〃
+     */
+    @Override
+    public List<RsSceneryInfoVo> queryList(RsSceneryInfoBo bo) {
+        LambdaQueryWrapper<RsSceneryInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<RsSceneryInfo> buildQueryWrapper(RsSceneryInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<RsSceneryInfo> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getSceneryName()), RsSceneryInfo::getSceneryName, bo.getSceneryName());
+        lqw.eq(bo.getSequence() != null, RsSceneryInfo::getSequence, bo.getSequence());
+        lqw.eq(bo.getCreateTime() != null, RsSceneryInfo::getCreateTime, bo.getCreateTime());
+        lqw.orderByAsc(RsSceneryInfo::getSequence);
+        return lqw;
+    }
+
+    /**
+     * 鏂板鏅尯閰嶇疆淇℃伅
+     */
+    @Override
+    public Boolean insertByBo(RsSceneryInfoBo bo) {
+        RsSceneryInfo add = MapstructUtils.convert(bo, RsSceneryInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 淇敼鏅尯閰嶇疆淇℃伅
+     */
+    @Override
+    public Boolean updateByBo(RsSceneryInfoBo bo) {
+        RsSceneryInfo update = MapstructUtils.convert(bo, RsSceneryInfo.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
+     */
+    private void validEntityBeforeSave(RsSceneryInfo entity){
+        entity.setCreateTime(new Date());
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鏅尯閰嶇疆淇℃伅
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java
index 889c7be..9ae6fcf 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficPropagandaServiceImpl.java
@@ -91,7 +91,6 @@
     @Override
     public Boolean updateByBo(RsTrafficPropagandaBo bo) {
         RsTrafficPropaganda update = MapstructUtils.convert(bo, RsTrafficPropaganda.class);
-        validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
 
diff --git a/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsIndicatorInfoMapper.xml b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsIndicatorInfoMapper.xml
new file mode 100644
index 0000000..3fe1610
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsIndicatorInfoMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.demo.mapper.RsIndicatorInfoMapper">
+
+</mapper>
diff --git a/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryInfoMapper.xml b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryInfoMapper.xml
new file mode 100644
index 0000000..f32ab6f
--- /dev/null
+++ b/dujy-modules/dujy-demo/src/main/resources/mapper/demo/RsSceneryInfoMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.demo.mapper.RsSceneryInfoMapper">
+
+</mapper>

--
Gitblit v1.8.0